diff -Nru freeciv-2.5.7/ai/default/advdiplomacy.c freeciv-2.5.8/ai/default/advdiplomacy.c --- freeciv-2.5.7/ai/default/advdiplomacy.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/ai/default/advdiplomacy.c 2017-08-12 11:47:30.000000000 +0000 @@ -1485,7 +1485,7 @@ remove_shared_vision(pplayer, aplayer); } /* Never forgive this */ - pplayer->ai_common.love[player_index(aplayer)] = -(BIG_NUMBER); + pplayer->ai_common.love[player_index(aplayer)] = -MAX_AI_LOVE; } else if (ship->state == SSHIP_STARTED && adip->warned_about_space == 0) { pplayer->ai_common.love[player_index(aplayer)] -= MAX_AI_LOVE / 10; diff -Nru freeciv-2.5.7/bootstrap/fc_svnrev_gen.h.tmpl freeciv-2.5.8/bootstrap/fc_svnrev_gen.h.tmpl --- freeciv-2.5.7/bootstrap/fc_svnrev_gen.h.tmpl 2017-05-13 11:57:57.000000000 +0000 +++ freeciv-2.5.8/bootstrap/fc_svnrev_gen.h.tmpl 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/********************************************************************** - Freeciv - Copyright (C) 2007 - The Freeciv Project - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -***********************************************************************/ - -/* common/fc_svnrev_gen.h is automatically generated from - * bootstrap/fc_svnrev_gen.h.tmpl. Do not edit fc_svnrev_gen.h, edit - * fc_svnrev_gen.h.tmpl */ - -#ifndef FC__FC_SVNREV_H -#define FC__FC_SVNREV_H - -/* One of the macros FC_SVNREV_OFF, FC_SVNREV_ON or FC_SVNREV_MOD defined. - * If FC_SVNREV_ON is defined, FC_SVNREV2 contains valid svn revision number - * string (currently starting with 'r') - * If FC_SVNREV_MOD is defined, this seems to be modified svn checkout. - * In that case FC_SVNREV1 contains word "modified " and FC_SVNREV2 - * revision number. - * If FC_SVNREV_OFF is defined, you should not use FC_SVNREV1 and - * FC_SVNREV2 even though they contain fallback string (currently "dist") */ -#define FC_SVNREV_ -#define FC_SVNREV1 "" -#define FC_SVNREV2 "" - -#endif /* FC__FC_SVNREV_H */ diff -Nru freeciv-2.5.7/bootstrap/generate_svnrev.sh freeciv-2.5.8/bootstrap/generate_svnrev.sh --- freeciv-2.5.7/bootstrap/generate_svnrev.sh 2017-05-13 11:57:57.000000000 +0000 +++ freeciv-2.5.8/bootstrap/generate_svnrev.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#!/bin/sh - -# Freeciv - Copyright (C) 2007 - The Freeciv Project - -# This script generates fc_svnrev_gen.h from fc_svnrev_gen.h.tmpl. -# See fc_svnrev_gen.h.tmpl for details. - -# Parameters - $1 - top srcdir -# $2 - top builddir -# - -# Absolete paths -SRCROOT="$(cd "$1" ; pwd)" -INPUTDIR="$(cd "$1/bootstrap" ; pwd)" -OUTPUTDIR="$(cd "$2/common" ; pwd)" - -REVSTATE="OFF" -REV1="" -REV2="dist" - -(cd "$INPUTDIR" - # Check that all commands required by this script are available - # If not, we will not claim to know which svn revision this is - # (REVSTATE will be OFF) - if which svn && which tail && which wc ; then - REVTMP="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 's/^Revision: //')" - if test "$REVTMP" != "r" ; then - # This is svn checkout. Check for local modifications - if test $(cd "$SRCROOT" ; svn diff | wc -l) -eq 0 ; then - REVSTATE=ON - REV2="$REVTMP" - else - REVSTATE=MOD - REV1="modified " - REV2="$REVTMP" - fi - fi - fi - - sed -e "s,,$REV1," -e "s,,$REV2," -e "s,,$REVSTATE," fc_svnrev_gen.h.tmpl > "$OUTPUTDIR/fc_svnrev_gen.h.tmp" - if ! test -f "$OUTPUTDIR/fc_svnrev_gen.h" || - ! cmp "$OUTPUTDIR/fc_svnrev_gen.h" "$OUTPUTDIR/fc_svnrev_gen.h.tmp" - then - mv "$OUTPUTDIR/fc_svnrev_gen.h.tmp" "$OUTPUTDIR/fc_svnrev_gen.h" - fi - rm -f "$OUTPUTDIR/fc_svnrev_gen.h.tmp" -) > /dev/null diff -Nru freeciv-2.5.7/ChangeLog freeciv-2.5.8/ChangeLog --- freeciv-2.5.7/ChangeLog 2017-05-13 11:59:02.000000000 +0000 +++ freeciv-2.5.8/ChangeLog 2017-08-12 11:47:30.000000000 +0000 @@ -1,3 +1,584 @@ +commit 7fcde2a2d6e1856a2542cf942de6533748fa65e3 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Aug 12 12:43:52 2017 +0100 + + Bump version number and mark as release code. + +commit c089a5a537a35638cb468e73445cca831bf6a346 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Aug 12 12:38:15 2017 +0100 + + Refresh NEWS-2.5 for 2.5.8, from wiki. + +commit 2a06e47cbd53e6ccca8c9b489183451c2638db97 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Aug 12 12:35:41 2017 +0100 + + Update doc/FAQ manually from wiki. + +commit 924daba157afc068b73f6a80485f054195ce6e92 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Aug 12 12:17:19 2017 +0100 + + Results of running "make update-po" + in translations/freeciv/ and translations/nations/ + +commit dfab11b64a5f18281682b8393ccb852d503f41a2 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Mon Aug 7 23:14:59 2017 +0100 + + es.po spot fix: fix "Migrants" translation. + + A stray leading space in the translation was causing this unit to + appear nested in the help when using the Spanish translation. + + Report and fix by David Fernandez. + + See hrm bug #662732. + +commit d5f71aa585dbb1acfb29430188f1f5c99fd48392 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Aug 12 01:02:35 2017 +0100 + + Finnish nations translation update by Sini Ruohomaa. + + 93%: 1720 translated, 124 untranslated. + +commit 3382b917921cb418c2b65f18a51293f2648ae286 +Author: Igx, The Dreaming Drummer +Date: Fri Aug 11 19:59:36 2017 +0100 + + Updated French translations. + + freeciv: 100%: 6292 translated messages. + +commit c8c61b3729ef5095c30408dc4fd7eccb33f4b908 +Author: Christian Prochaska +Date: Sun Jul 30 21:33:13 2017 +0200 + + Updated msys1 environment (toolchain) + + See hrm Bug #682703, Bug #681877, Bug #681643 + +commit cc0bd96500e558de1dbba51af13a812190f9ca99 +Author: Joan Creus +Date: Sat Aug 5 22:47:36 2017 -0700 + + Minor changes to Catalan translation + +commit 6fda16cd21241998557c7495b04c21de4939379a +Author: Konstantin Vedeneev +Date: Sat Aug 5 02:33:53 2017 +0500 + + Russian translation: minor qt-related update + +commit 35ffcd324a5d49ae89f1cd77fa8b0a83330d7673 +Author: Konstantin Vedeneev +Date: Sat Aug 5 01:19:07 2017 +0500 + + Russian translation update + +commit 4cf0f37dc91726a051e95a137b5fca251c2f25fc +Author: Joan Creus +Date: Thu Aug 3 00:58:00 2017 -0700 + + Minor changes to Catalan translation + +commit 2cfb07cc54131eaa1d93039d40a5e4af27a6e6a9 +Author: Joan Creus +Date: Wed Aug 2 22:56:31 2017 -0700 + + Updating Catalan translation for nations + +commit 2408c2a9487719618bd93bbe75c68dfc8656936a +Author: Joan Creus +Date: Mon Jul 31 00:38:00 2017 -0700 + + Typo in Catalan translation + +commit bbe591242d6bbb45d8ed4744e8afd09173b2c583 +Author: Joan Creus +Date: Sun Jul 30 21:58:58 2017 -0700 + + Update Catalan translation + +commit 184af39382515990cb7a3b196e00b468692a1b17 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sun Jul 23 13:08:35 2017 +0100 + + Remove unused isotrident/ocean.{png,spec}. + + These were added in 2007 (PR#35908), but never used or shipped. + + See hrm bug #678446. + +commit 3b20fa5b0c73437a028d139a5f3637e89d7936a0 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Jul 22 09:59:11 2017 +0100 + + Comment that citizens_graphic/alt don't work. + + They were defined in 2003, but never implemented. + + See hrm bug #685211. + +commit 51ae7b4ce3c289e51502cb22f648a619ca77e334 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sun Jul 23 11:11:12 2017 +0100 + + Updated en_GB core translations for S2_5. + + freeciv: 100%: 6292 translated. + +commit 75c48716e76813be620653d270f417e580b65786 +Author: Marko Lindqvist +Date: Mon Jul 17 12:02:54 2017 +0300 + + Reinitialize have_huts to FALSE when generating new map + + See hrm Bug #682576 + + Signed-off-by: Marko Lindqvist + +commit 1841357a4aaeeba168fe7377bcbbc16e345fadf5 +Author: Marko Lindqvist +Date: Mon Jul 17 01:00:04 2017 +0300 + + Update Finnish translation + + Signed-off-by: Marko Lindqvist + +commit 368e0f913a54cf90960c7ee46cb09d447a89dacc +Author: Sveinung Kvilhaugsvik +Date: Thu Sep 22 16:28:45 2016 +0000 + + Give reason when pop_cost blocks unit building. + + Patch by Sveinung Kvilhaugsvik (sveinung@gna). + + See gna patch #7707. + +commit 9838d94a62d5100a8c94e6aa301b44e3dfb8cbb6 +Author: Sveinung Kvilhaugsvik +Date: Tue Aug 16 02:38:27 2016 +0000 + + Document no unit hut barbarians for GameLoss. + + Requested by Frank , patch by Sveinung Kvilhaugsvik (sveinung@gna). + + See gna patch #7545. + +commit 559958389fd0b80582d14a74cb1bb63a7ca23f9a +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Wed Jul 12 21:41:48 2017 +0100 + + Reduce civ2civ3 25% terrain defence to 20%. + + In 2.5.x, the bonus is rounded down to the nearest 10% anyway, so this + has no functional effect, but it makes the help less misleading. + (On later branches, a 25% bonus is possible; this was fixed in + gna bug #25432.) + + See hrm bug #682494. + +commit 497e1e42626fde5f7f2548fe77bd3e3141ac5ca6 +Author: Marko Lindqvist +Date: Thu Jul 13 12:15:04 2017 +0300 + + Update Finnish translation + + Signed-off-by: Marko Lindqvist + +commit c14a73a4082017238eddbb9d2a2cc71aef74c3f3 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Jul 8 23:02:40 2017 +0100 + + Isophex update from GriffonSpade. + + - Added lake terrain + - Updated floor and coast + - Changed river mouths to new versions + - Fixed river connectors to all properly connect + - Added new NW and SE river mouths (fixes hrm feature #657132) + - Add tx.oil_rig + - Add ts.aluminum, elephant, rubber, saltpeter, uranium + - Reorganise graphics/grids + + (terrain1.png has cyan path sprites that are not used on this branch.) + + See hrm feature #680743. + +commit 4390cf6e5e7b13c0fb224bc3ab1700df9eff6d87 +Author: Marko Lindqvist +Date: Tue Jul 11 18:47:27 2017 +0300 + + Do not make tile info window app paintable + + Reported by S.C. L. (Caedo) + + See hrm Bug #656549 + + Signed-off-by: Marko Lindqvist + +commit f583540d0d7f4a8c67476418bf00608f824c1f98 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Jul 8 16:42:39 2017 +0100 + + Fix typo 'Andew Johnson' in american.ruleset. + + See hrm bug #681847. + +commit 8882cf7a3c8b67aec7d4b7b1056dd8bfabd1ab86 +Author: Christian Prochaska +Date: Sun Jun 25 23:18:45 2017 +0200 + + Updated msys1 environment (git) + + See hrm Task #660908 + +commit accf9d46175946b28ecfa1d947a485211b6df6ee +Author: Sveinung Kvilhaugsvik +Date: Tue Jun 6 11:33:39 2017 +0200 + + Clarify that try_to_save_unit() is static. + + The function try_to_save_unit() is declared to be static in its prototype. + Declare it static in its definition too. + + See hrm Feature #674435 + +commit fc3e4a87f776d2dccc6802c2fb05e52132eef7f1 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Thu Jun 29 09:35:40 2017 +0100 + + Drop --enable-svnrev support from mpcli too. + + See hrm bug #679917. + +commit 70d095ca57d807579387b226215f8c0d0429a9e7 +Author: Marko Lindqvist +Date: Thu Jun 29 09:42:05 2017 +0300 + + Drop svn repository support + + See hrm Feature #679223 + + Signed-off-by: Marko Lindqvist + +commit 599b016a32b52e7aa0a94f1d92cdd9a4214dd99d +Author: Marko Lindqvist +Date: Thu Jun 29 09:41:30 2017 +0300 + + Comment typofix: "fullfilled" -> "fulfilled" + + Signed-off-by: Marko Lindqvist + +commit f7f973bfb65cfd8c86a6b9f114af810922f89efa +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sun Jun 25 16:58:35 2017 +0100 + + Add missing .gitignore. + +commit c79c136c6a5dc4a9e2e3bd5512c978e7a22217e7 +Author: Sveinung Kvilhaugsvik +Date: Tue Jun 6 08:46:58 2017 +0200 + + Fix GTK client unit selection dialog memory leak. + + Don't leak memory when more than one unit is selected at once in the GTK + clients' unit selection dialog. + + Found with Valgrind. + + See hrm Bug #674321 + +commit 9d1da5b16bd545652d2f7e3225e701cb007faa8b +Author: Marko Lindqvist +Date: Wed Jun 28 09:58:12 2017 +0300 + + Do not draw to screen from map_canvas_resized() + + See hrm Bug #678972 + + Signed-off-by: Marko Lindqvist + +commit 3fe79d58cfbc6765b84aa5fef34e16c122da4304 +Author: Marko Lindqvist +Date: Wed Jun 28 09:57:29 2017 +0300 + + Distribute tolua.pkg + + Reported by Jacob Nevins + + See hrm Bug #678447 + + Signed-off-by: Marko Lindqvist + +commit 01431853524aec6cfef2e48093425728baef3d17 +Author: Marko Lindqvist +Date: Wed Jun 28 09:56:22 2017 +0300 + + Replace documentation references to subversion with git references + + See hrm Feature #664195 + + Signed-off-by: Marko Lindqvist + +commit b6a013429d4fa2374b89ff9778b1bee29f8d8b4c +Author: Marko Lindqvist +Date: Tue Jun 27 18:29:59 2017 +0300 + + Increase plain file buffer size to 8MB + + Reported by Andreas Røsdal + + See hrm Bug #679197 + + Signed-off-by: Marko Lindqvist + +commit 1e1717d9b1cd8af46faa0ae1041c18f43f89b5a6 +Author: Marko Lindqvist +Date: Tue Jun 27 18:29:28 2017 +0300 + + Distribute README.tilesets + + Reported by Jacob Nevins + + See hrm Bug #678449 + + Signed-off-by: Marko Lindqvist + +commit a13c2f9acbad92238d4e9d09235dd4aaec6ad3f1 +Author: Sveinung Kvilhaugsvik +Date: Mon Jun 26 09:17:21 2017 +0200 + + Comment spell fix: FLASE -> FALSE. + +commit b54140793dfbf1a2aee68755b6d602900af10849 +Author: Sveinung Kvilhaugsvik +Date: Mon Jun 26 09:10:03 2017 +0200 + + Comment spell fix: untis -> units. + +commit 3ca2a3310e62c9e0a434391bc0b9f205a171bdda +Author: Sveinung Kvilhaugsvik +Date: Mon Jun 26 09:03:53 2017 +0200 + + Number header comment like the code. + +commit 75e5181f1b753d70f34b3e54dd057e6b2d352382 +Author: Marko Lindqvist +Date: Mon Jun 26 09:51:47 2017 +0300 + + Comment typofix: "consiguration" -> "configuration" + + Signed-off-by: Marko Lindqvist + +commit ebc910ca354cae0d45850ef54cfe8c7f32a42095 +Author: Marko Lindqvist +Date: Mon Jun 26 09:51:11 2017 +0300 + + Fix theoretical NULL dereference in base_fc_utf8_strlcpy_rep() + + See hrm Feature #675955 + + Signed-off-by: Marko Lindqvist + +commit 50bf2f950016d28470342484d803b28611f51dad +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sun Jun 25 14:57:44 2017 +0100 + + Final Subversion-format ChangeLog update. + +commit 965f1cdb06936a301ccc0531e14246909cca7bad +Author: Marko Lindqvist +Date: Sun Jun 25 12:56:47 2017 +0300 + + Do not try to update plrmap before it's created + + Reported by David Fernandez (bard) + + See hrm Bug #673767 + + Signed-off-by: Marko Lindqvist + +commit 80166d42c539b22486a5a888780679dec997a7af +Author: Marko Lindqvist +Date: Sun Jun 25 12:55:36 2017 +0300 + + Add -no-pie to LDFLAGS when --enable-gprof given + + Se hrm Feature #675699 + + Signed-off-by: Marko Lindqvist + +commit 87eb47cd98c601ec9c324ef929bf338cc7779f09 +Author: Marko Lindqvist +Date: Sun Jun 25 12:54:58 2017 +0300 + + Do not sanitycheck vision sharing of dead players + + Reported by David Fernandez (bard) + + See hrm Bug #662701 + + Signed-off-by: Marko Lindqvist + +commit ce36e4feafbe4d7e430e54ad5e126bcaea854f48 +Author: Marko Lindqvist +Date: Sun Jun 25 12:54:34 2017 +0300 + + Check that research is selected before trying to get its cost + + See hrm Bug #664286 + + Signed-off-by: Marko Lindqvist + +commit 6e3c1d98fe215cc1fa5ccc5d82a324fb1eb271cb +Author: Marko Lindqvist +Date: Sat Jun 24 22:56:26 2017 +0300 + + Update INSTALL to git time + + See hrm Feature #654670 + + Signed-off-by: Marko Lindqvist + +commit 21b902993af64e3fc0555e8cec121ebe094437a5 +Author: Marko Lindqvist +Date: Sat Jun 24 22:56:09 2017 +0300 + + Use VERSION_REVTYPE git in Windows Installer build + + See hrm Feature #654689 + + Signed-off-by: Marko Lindqvist + +commit d526cced478f66ee0ce2e1cf3edd69b30b3d59a9 +Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> +Date: Sat Jun 24 20:01:57 2017 +0100 + + Convert trident/roads.spec to Unix line endings. + + It mistakenly had DOS line endings in the Subversion object store, but + this was apparently masked by the svn property eol-style:native or + something, so this wasn't visible in tarballs. + + See hrm bug #678452. +------------------------------------------------------------------------ +r35685 | cazfi | 2017-05-21 18:07:28 +0100 (Sun, 21 May 2017) | 10 lines +Changed paths: + M /branches/S2_5/server/srv_main.c + +Do not try to cancel Team membership + +When a player with which we are allied and another with which we +are in the same team go to war, only cancel the alliance. Do not try +to cancel pact with the team member. + +Reported by David Fernandez (bard) + +See hrm Bug #662059 + +------------------------------------------------------------------------ +r35663 | cazfi | 2017-05-19 22:28:06 +0100 (Fri, 19 May 2017) | 4 lines +Changed paths: + M /branches/S2_5/server/scripting/api_server_edit.c + +Prevent scripting API unit creation from creating stack conflicts + +See hrm Bug #661533 + +------------------------------------------------------------------------ +r35646 | cazfi | 2017-05-18 14:13:21 +0100 (Thu, 18 May 2017) | 6 lines +Changed paths: + M /branches/S2_5/server/unittools.c + +Make sure unit vision radius is not negative + +Reported by David Fernandez (bard) + +See hrm Bug #661313 + +------------------------------------------------------------------------ +r35642 | sveinung | 2017-05-18 10:31:47 +0100 (Thu, 18 May 2017) | 3 lines +Changed paths: + M /branches/S2_5/server/diplomats.c + +A non Spy is spent, not caught. It can't escape. + +See hrm Feature #657298 +------------------------------------------------------------------------ +r35641 | sveinung | 2017-05-18 10:31:39 +0100 (Thu, 18 May 2017) | 9 lines +Changed paths: + M /branches/S2_5/doc/README.ruleset_civ2civ3 + +civ2civ3: improve README.civ2civ3 text. + +Happy borders aren't disabled after gna patch #7080. Don't claim it is. +Improve the English by removing capitalization from some words. Expand pop +to population. + +Patch by David Fernandez + +See hrm Feature #657562 +------------------------------------------------------------------------ +r35636 | cazfi | 2017-05-18 10:16:25 +0100 (Thu, 18 May 2017) | 6 lines +Changed paths: + M /branches/S2_5/server/citytools.c + +Make sure veterancy of the newly built unit is not negative + +Reported by David Fernandez (bard) + +See hrm Bug #661193 + +------------------------------------------------------------------------ +r35632 | cazfi | 2017-05-18 10:03:06 +0100 (Thu, 18 May 2017) | 6 lines +Changed paths: + M /branches/S2_5/common/unit.c + +Fix division by zero when unit activity rate is zero + +Reported by David Fernandez (bard) + +See hrm Bug #660342 + +------------------------------------------------------------------------ +r35616 | cazfi | 2017-05-16 14:33:54 +0100 (Tue, 16 May 2017) | 4 lines +Changed paths: + M /branches/S2_5/ai/default/advdiplomacy.c + +Do not set out-of-range AI love towards player launching spaceship + +See hrm Bug #660363 + +------------------------------------------------------------------------ +r35588 | cazfi | 2017-05-15 18:16:12 +0100 (Mon, 15 May 2017) | 4 lines +Changed paths: + M /branches/S2_5/doc/README.fcdb + M /branches/S2_5/lua/database.lua + +Update ticket links in documentation to point to hostedredmine. + +See hrm Feature #660271 + +------------------------------------------------------------------------ +r35560 | igx31 | 2017-05-13 20:01:52 +0100 (Sat, 13 May 2017) | 3 lines +Changed paths: + M /branches/S2_5/translations/freeciv/fr.po + M /branches/S2_5/translations/nations/fr.po + +Updated French translations + + +------------------------------------------------------------------------ +r35545 | jtn | 2017-05-13 12:39:02 +0100 (Sat, 13 May 2017) | 2 lines +Changed paths: + M /branches/S2_5/ChangeLog + +Update ChangeLog as of S2_5 r35544. + ------------------------------------------------------------------------ r35544 | jtn | 2017-05-13 12:36:18 +0100 (Sat, 13 May 2017) | 1 line Changed paths: diff -Nru freeciv-2.5.7/client/control.c freeciv-2.5.8/client/control.c --- freeciv-2.5.7/client/control.c 2017-05-13 11:58:01.000000000 +0000 +++ freeciv-2.5.8/client/control.c 2017-08-12 11:47:30.000000000 +0000 @@ -1033,7 +1033,7 @@ } /**************************************************************************** - Return TRUE if at least one of the untis can do an attack at the tile. + Return TRUE if at least one of the units can do an attack at the tile. ****************************************************************************/ static bool can_units_attack_at(struct unit_list *punits, const struct tile *ptile) diff -Nru freeciv-2.5.7/client/gui-gtk-2.0/pages.c freeciv-2.5.8/client/gui-gtk-2.0/pages.c --- freeciv-2.5.7/client/gui-gtk-2.0/pages.c 2017-05-13 11:58:01.000000000 +0000 +++ freeciv-2.5.8/client/gui-gtk-2.0/pages.c 2017-08-12 11:47:30.000000000 +0000 @@ -161,31 +161,25 @@ if (!layout) { char msgbuf[128]; - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; layout = pango_layout_new(gdk_pango_context_get()); pango_layout_set_font_description(layout, pango_font_description_from_string("Sans Bold 10")); - if (rev_ver == NULL) { - rev_ver = fc_git_revision(); + rev_ver = fc_git_revision(); - if (rev_ver == NULL) { - /* TRANS: "version 2.6.0, gui-gtk-2.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, %s client"), - word_version(), VERSION_STRING, client_string); - } else { - /* TRANS: "version 2.6.0 - * commit: [modified] - * gui-gtk-2.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s\ncommit: %s\n%s client"), - word_version(), VERSION_STRING, rev_ver, client_string); - left = TRUE; - } + if (rev_ver == NULL) { + /* TRANS: "version 2.6.0, gui-gtk-2.0 client" */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, %s client"), + word_version(), VERSION_STRING, client_string); } else { - /* TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s (%s), %s client"), + /* TRANS: "version 2.6.0 + * commit: [modified] + * gui-gtk-2.0 client" */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s\ncommit: %s\n%s client"), word_version(), VERSION_STRING, rev_ver, client_string); + left = TRUE; } pango_layout_set_text(layout, msgbuf, -1); diff -Nru freeciv-2.5.7/client/gui-gtk-2.0/unitselect.c freeciv-2.5.8/client/gui-gtk-2.0/unitselect.c --- freeciv-2.5.7/client/gui-gtk-2.0/unitselect.c 2017-05-13 11:58:01.000000000 +0000 +++ freeciv-2.5.8/client/gui-gtk-2.0/unitselect.c 2017-08-12 11:47:30.000000000 +0000 @@ -859,7 +859,14 @@ } unit_list_iterate_end; } - if (!transported && unit_is_in_focus(punit)) { + if (!transported && unit_is_in_focus(punit) + && get_num_units_in_focus() == 1) { + /* Put the keyboard focus on the selected unit. It isn't transported. + * Selection maps to keyboard focus since it alone is selected. */ + fc_assert_action(pdialog->tabs[loc].path == NULL, + /* Don't leak memory. */ + gtk_tree_path_free(pdialog->tabs[loc].path)); + pdialog->tabs[loc].path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), it); } diff -Nru freeciv-2.5.7/client/gui-gtk-3.0/mapctrl.c freeciv-2.5.8/client/gui-gtk-3.0/mapctrl.c --- freeciv-2.5.7/client/gui-gtk-3.0/mapctrl.c 2017-05-13 11:57:58.000000000 +0000 +++ freeciv-2.5.8/client/gui-gtk-3.0/mapctrl.c 2017-08-12 11:47:30.000000000 +0000 @@ -117,8 +117,7 @@ struct unit *punit; if (TILE_UNKNOWN != client_tile_get_known(ptile)) { - p=gtk_window_new(GTK_WINDOW_POPUP); - gtk_widget_set_app_paintable(p, TRUE); + p = gtk_window_new(GTK_WINDOW_POPUP); gtk_container_set_border_width(GTK_CONTAINER(p), 4); gtk_container_add(GTK_CONTAINER(p), gtk_label_new(popup_info_text(ptile))); diff -Nru freeciv-2.5.7/client/gui-gtk-3.0/pages.c freeciv-2.5.8/client/gui-gtk-3.0/pages.c --- freeciv-2.5.7/client/gui-gtk-3.0/pages.c 2017-05-13 11:57:58.000000000 +0000 +++ freeciv-2.5.8/client/gui-gtk-3.0/pages.c 2017-08-12 11:47:30.000000000 +0000 @@ -166,31 +166,25 @@ if (!layout) { char msgbuf[128]; - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; layout = pango_layout_new(gtk_widget_create_pango_context(w)); pango_layout_set_font_description(layout, pango_font_description_from_string("Sans Bold 10")); - if (rev_ver == NULL) { - rev_ver = fc_git_revision(); + rev_ver = fc_git_revision(); - if (rev_ver == NULL) { - /* TRANS: "version 2.6.0, gui-gtk-3.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, %s client"), - word_version(), VERSION_STRING, client_string); - } else { - /* TRANS: "version 2.6.0 - * commit: [modified] - * gui-gtk-3.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s\ncommit: %s\n%s client"), - word_version(), VERSION_STRING, rev_ver, client_string); - left = TRUE; - } + if (rev_ver == NULL) { + /* TRANS: "version 2.6.0, gui-gtk-3.0 client" */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, %s client"), + word_version(), VERSION_STRING, client_string); } else { - /* TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s (%s), %s client"), + /* TRANS: "version 2.6.0 + * commit: [modified] + * gui-gtk-3.0 client" */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s\ncommit: %s\n%s client"), word_version(), VERSION_STRING, rev_ver, client_string); + left = TRUE; } pango_layout_set_text(layout, msgbuf, -1); diff -Nru freeciv-2.5.7/client/gui-gtk-3.0/unitselect.c freeciv-2.5.8/client/gui-gtk-3.0/unitselect.c --- freeciv-2.5.7/client/gui-gtk-3.0/unitselect.c 2017-05-13 11:57:58.000000000 +0000 +++ freeciv-2.5.8/client/gui-gtk-3.0/unitselect.c 2017-08-12 11:47:30.000000000 +0000 @@ -856,7 +856,14 @@ } unit_list_iterate_end; } - if (!transported && unit_is_in_focus(punit)) { + if (!transported && unit_is_in_focus(punit) + && get_num_units_in_focus() == 1) { + /* Put the keyboard focus on the selected unit. It isn't transported. + * Selection maps to keyboard focus since it alone is selected. */ + fc_assert_action(pdialog->tabs[loc].path == NULL, + /* Don't leak memory. */ + gtk_tree_path_free(pdialog->tabs[loc].path)); + pdialog->tabs[loc].path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), it); } diff -Nru freeciv-2.5.7/client/gui-qt/citydlg.cpp freeciv-2.5.8/client/gui-qt/citydlg.cpp --- freeciv-2.5.7/client/gui-qt/citydlg.cpp 2017-05-13 11:58:00.000000000 +0000 +++ freeciv-2.5.8/client/gui-qt/citydlg.cpp 2017-08-12 11:47:30.000000000 +0000 @@ -274,7 +274,7 @@ } /**************************************************************************** - Unloads all untis from transporter + Unloads all units from transporter ****************************************************************************/ void unit_item::unload_all() { diff -Nru freeciv-2.5.7/client/gui-qt/pages.cpp freeciv-2.5.8/client/gui-qt/pages.cpp --- freeciv-2.5.7/client/gui-qt/pages.cpp 2017-05-13 11:58:00.000000000 +0000 +++ freeciv-2.5.8/client/gui-qt/pages.cpp 2017-08-12 11:47:30.000000000 +0000 @@ -119,33 +119,26 @@ painter.setPen(Qt::white); - rev_ver = fc_svn_revision(); - if (rev_ver == NULL) { - rev_ver = fc_git_revision(); - - if (rev_ver == NULL) { - /* TRANS: "version 2.6.0, Qt client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, Qt client"), - word_version(), VERSION_STRING); - } else { - fc_snprintf(msgbuf, sizeof(msgbuf), "%s%s", - word_version(), VERSION_STRING); - painter.drawText(10, - main_graphics.height() - fm.descent() - fm.height() * 2, - msgbuf); - - /* TRANS: "commit: [modified] " */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("commit: %s"), rev_ver); - painter.drawText(10, - main_graphics.height() - fm.descent() - fm.height(), - msgbuf); + rev_ver = fc_git_revision(); - strncpy(msgbuf, _("Qt client"), sizeof(msgbuf)); - } + if (rev_ver == NULL) { + /* TRANS: "version 2.6.0, Qt client" */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, Qt client"), + word_version(), VERSION_STRING); } else { - /* TRANS: "version 2.6.0 (r25000), Qt client" */ - fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s (%s), Qt client"), - word_version(), VERSION_STRING, rev_ver); + fc_snprintf(msgbuf, sizeof(msgbuf), "%s%s", + word_version(), VERSION_STRING); + painter.drawText(10, + main_graphics.height() - fm.descent() - fm.height() * 2, + msgbuf); + + /* TRANS: "commit: [modified] " */ + fc_snprintf(msgbuf, sizeof(msgbuf), _("commit: %s"), rev_ver); + painter.drawText(10, + main_graphics.height() - fm.descent() - fm.height(), + msgbuf); + + strncpy(msgbuf, _("Qt client"), sizeof(msgbuf)); } painter.drawText(main_graphics.width()-fm.width(msgbuf)-10, diff -Nru freeciv-2.5.7/client/gui-sdl/pages.c freeciv-2.5.8/client/gui-sdl/pages.c --- freeciv-2.5.7/client/gui-sdl/pages.c 2017-05-13 11:58:03.000000000 +0000 +++ freeciv-2.5.8/client/gui-sdl/pages.c 2017-08-12 11:47:30.000000000 +0000 @@ -132,15 +132,14 @@ { SDL_Color bg_color = {255, 255, 255, 96}; SDL_Color *line_color = &(SDL_Color){128, 128, 128, 255}; - int count = 0; struct widget *pWidget = NULL, *pWindow = NULL; SDL_Surface *pBackground; int h = 0; SDL_Rect area; char verbuf[200]; - const char *rev_ver = fc_svn_revision(); - + const char *rev_ver; + /* create dialog */ pStartMenu = fc_calloc(1, sizeof(struct SMALL_DLG)); @@ -151,18 +150,13 @@ area = pWindow->area; /* Freeciv version */ - if (rev_ver == NULL) { - /* TRANS: Freeciv 2.4.0 */ - fc_snprintf(verbuf, sizeof(verbuf), _("Freeciv %s"), VERSION_STRING); - } else { - /* TRANS: Freeciv 2.4.0 (r25000) */ - fc_snprintf(verbuf, sizeof(verbuf), _("Freeciv %s (%s)"), VERSION_STRING, rev_ver); - } + /* TRANS: Freeciv 2.4.0 */ + fc_snprintf(verbuf, sizeof(verbuf), _("Freeciv %s"), VERSION_STRING); pWidget = create_iconlabel_from_chars(NULL, pWindow->dst, verbuf, adj_font(12), (WF_SELLECT_WITHOUT_BAR|WF_RESTORE_BACKGROUND|WF_FREE_DATA)); - + pWidget->string16->style |= SF_CENTER | TTF_STYLE_BOLD; area.w = MAX(area.w, pWidget->size.w); diff -Nru freeciv-2.5.7/client/gui-xaw/Freeciv.h freeciv-2.5.8/client/gui-xaw/Freeciv.h --- freeciv-2.5.7/client/gui-xaw/Freeciv.h 2017-05-13 12:07:43.000000000 +0000 +++ freeciv-2.5.8/client/gui-xaw/Freeciv.h 2017-08-12 11:54:28.000000000 +0000 @@ -2,7 +2,7 @@ /* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */ /**************************************************/ "Freeciv*gotAppDefFile: True", -"Freeciv*version: 2.5.7", +"Freeciv*version: 2.5.8", "Freeciv.title: Freeciv", "Freeciv.iconName: Freeciv", "Freeciv*borderColor: black", diff -Nru freeciv-2.5.7/client/gui-xaw/graphics.c freeciv-2.5.8/client/gui-xaw/graphics.c --- freeciv-2.5.7/client/gui-xaw/graphics.c 2017-05-13 11:58:02.000000000 +0000 +++ freeciv-2.5.8/client/gui-xaw/graphics.c 2017-08-12 11:47:30.000000000 +0000 @@ -85,7 +85,6 @@ int have_face; const char *motto = freeciv_motto(); XFontSetExtents *exts; - const char *rev_ver = fc_svn_revision(); /* metrics */ @@ -94,8 +93,8 @@ /* get colors */ - if(XParseColor(display, cmap, COLOR_MOTTO_FACE, &face) && - XAllocColor(display, cmap, &face)) { + if (XParseColor(display, cmap, COLOR_MOTTO_FACE, &face) + && XAllocColor(display, cmap, &face)) { have_face = TRUE; } else { face.pixel = get_color(tileset, COLOR_OVERVIEW_VIEWRECT)->color.pixel; @@ -126,25 +125,22 @@ w = XmbTextEscapement(main_font_set, word_version(), strlen(word_version())); XSetForeground(display, font_gc, - get_color(tileset, COLOR_OVERVIEW_UNKNOWN)->color.pixel); + get_color(tileset, COLOR_OVERVIEW_UNKNOWN)->color.pixel); XmbDrawString(display, radar_gfx_sprite->pixmap, - main_font_set, font_gc, - (tot / 2 - w / 2) + 1, y + 1, - word_version(), strlen(word_version())); + main_font_set, font_gc, + (tot / 2 - w / 2) + 1, y + 1, + word_version(), strlen(word_version())); XSetForeground(display, font_gc, - get_color(tileset, COLOR_OVERVIEW_VIEWRECT)->color.pixel); + get_color(tileset, COLOR_OVERVIEW_VIEWRECT)->color.pixel); XmbDrawString(display, radar_gfx_sprite->pixmap, - main_font_set, font_gc, - tot / 2 - w / 2, y, - word_version(), strlen(word_version())); + main_font_set, font_gc, + tot / 2 - w / 2, y, + word_version(), strlen(word_version())); y += lin; - if (rev_ver != NULL) { - fc_snprintf(s, sizeof(s), "%s (%s)", VERSION_STRING, rev_ver); - } else { - fc_snprintf(s, sizeof(s), "%s", VERSION_STRING); - } + fc_snprintf(s, sizeof(s), "%s", VERSION_STRING); + w = XmbTextEscapement(main_font_set, s, strlen(s)); XSetForeground(display, font_gc, get_color(tileset, COLOR_OVERVIEW_UNKNOWN)->color.pixel); diff -Nru freeciv-2.5.7/client/luascript/tolua_client_gen.h freeciv-2.5.8/client/luascript/tolua_client_gen.h --- freeciv-2.5.7/client/luascript/tolua_client_gen.h 2017-05-13 12:03:36.000000000 +0000 +++ freeciv-2.5.8/client/luascript/tolua_client_gen.h 2017-08-12 11:53:44.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: client -** Generated automatically by tolua 5.2.0 on Sat May 13 13:03:36 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:53:44 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/client/mapview_common.c freeciv-2.5.8/client/mapview_common.c --- freeciv-2.5.7/client/mapview_common.c 2017-05-13 11:58:00.000000000 +0000 +++ freeciv-2.5.8/client/mapview_common.c 2017-08-12 11:47:30.000000000 +0000 @@ -3074,7 +3074,11 @@ if (tile_size_changed) { update_map_canvas_visible(); center_tile_overviewcanvas(); - unqueue_mapview_updates(TRUE); + + /* Do not draw to the screen here as that could cause problems + * when we are only initially setting up the view and some widgets + * are not yet ready. */ + unqueue_mapview_updates(FALSE); redrawn = TRUE; } diff -Nru freeciv-2.5.7/client/options.c freeciv-2.5.8/client/options.c --- freeciv-2.5.7/client/options.c 2017-05-13 11:58:00.000000000 +0000 +++ freeciv-2.5.8/client/options.c 2017-08-12 11:47:30.000000000 +0000 @@ -4905,7 +4905,7 @@ /**************************************************************** Update a desired settable option in the hash table from a value - which can be different of the current consiguration. + which can be different of the current configuration. *****************************************************************/ void desired_settable_option_update(const char *op_name, const char *op_value, diff -Nru freeciv-2.5.7/common/combat.c freeciv-2.5.8/common/combat.c --- freeciv-2.5.7/common/combat.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/common/combat.c 2017-08-12 11:47:30.000000000 +0000 @@ -36,7 +36,7 @@ /*********************************************************************** Checks if player is restricted diplomatically from attacking the tile. - Returns FLASE if + Returns FALSE if 1) the tile is empty or 2) the tile contains a non-enemy city or 3) the tile contains a non-enemy unit @@ -109,8 +109,8 @@ 1) it does not have any attack power. 2) it is not a fighter and defender is a flying unit (except city/airbase). 3) it is a ground unit without marine ability and it attacks from ocean. - 4) it is a ground unit and it attacks a target on an ocean square. - 5) it is a sailing unit without shore bombardment capability and it + 4) it is a ground unit and it attacks a target on an ocean square or + it is a sailing unit without shore bombardment capability and it attempts to attack land. Does NOT check: diff -Nru freeciv-2.5.7/common/Makefile.am freeciv-2.5.8/common/Makefile.am --- freeciv-2.5.7/common/Makefile.am 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/common/Makefile.am 2017-08-12 11:47:30.000000000 +0000 @@ -142,17 +142,11 @@ $(srcdir)/packets_gen.h \ $(srcdir)/packets_gen.c -if SVNREV -BUILT_SOURCES += fc_svnrev_gen.h -endif if GITREV BUILT_SOURCES += fc_gitrev_gen.h endif -.PHONY : fc_svnrev_gen.h fc_gitrev_gen.h - -fc_svnrev_gen.h : - "$(top_srcdir)/bootstrap/generate_svnrev.sh" "$(top_srcdir)" "$(top_builddir)" +.PHONY : fc_gitrev_gen.h fc_gitrev_gen.h : "$(top_srcdir)/bootstrap/generate_gitrev.sh" "$(top_srcdir)" "$(top_builddir)" diff -Nru freeciv-2.5.7/common/Makefile.in freeciv-2.5.8/common/Makefile.in --- freeciv-2.5.7/common/Makefile.in 2017-05-13 12:00:04.000000000 +0000 +++ freeciv-2.5.8/common/Makefile.in 2017-08-12 11:50:29.000000000 +0000 @@ -78,8 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@SVNREV_TRUE@am__append_1 = fc_svnrev_gen.h -@GITREV_TRUE@am__append_2 = fc_gitrev_gen.h +@GITREV_TRUE@am__append_1 = fc_gitrev_gen.h subdir = common DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/bootstrap/depcomp @@ -741,8 +740,7 @@ $(top_builddir)/common/scriptcore/libscriptcore.la \ $(COMMON_LIBS) -BUILT_SOURCES = packets_gen.c packets_gen.h $(am__append_1) \ - $(am__append_2) +BUILT_SOURCES = packets_gen.c packets_gen.h $(am__append_1) # These files are not generated to builddir, but to srcdir */ MAINTAINERCLEANFILES = \ @@ -1202,10 +1200,7 @@ cd $(srcdir) && ./generate_packets.py touch packets_generate -.PHONY : fc_svnrev_gen.h fc_gitrev_gen.h - -fc_svnrev_gen.h : - "$(top_srcdir)/bootstrap/generate_svnrev.sh" "$(top_srcdir)" "$(top_builddir)" +.PHONY : fc_gitrev_gen.h fc_gitrev_gen.h : "$(top_srcdir)/bootstrap/generate_gitrev.sh" "$(top_srcdir)" "$(top_builddir)" diff -Nru freeciv-2.5.7/common/scriptcore/tolua_common_a_gen.h freeciv-2.5.8/common/scriptcore/tolua_common_a_gen.h --- freeciv-2.5.7/common/scriptcore/tolua_common_a_gen.h 2017-05-13 12:00:57.000000000 +0000 +++ freeciv-2.5.8/common/scriptcore/tolua_common_a_gen.h 2017-08-12 11:51:19.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: common_a -** Generated automatically by tolua 5.2.0 on Sat May 13 13:00:57 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/common/scriptcore/tolua_common_z_gen.h freeciv-2.5.8/common/scriptcore/tolua_common_z_gen.h --- freeciv-2.5.7/common/scriptcore/tolua_common_z_gen.h 2017-05-13 12:00:57.000000000 +0000 +++ freeciv-2.5.8/common/scriptcore/tolua_common_z_gen.h 2017-08-12 11:51:19.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: common_z -** Generated automatically by tolua 5.2.0 on Sat May 13 13:00:57 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/common/scriptcore/tolua_game_gen.c freeciv-2.5.8/common/scriptcore/tolua_game_gen.c --- freeciv-2.5.7/common/scriptcore/tolua_game_gen.c 2017-05-13 12:00:57.000000000 +0000 +++ freeciv-2.5.8/common/scriptcore/tolua_game_gen.c 2017-08-12 11:51:19.000000000 +0000 @@ -43,21 +43,21 @@ /* function to register type */ static void tolua_reg_types (lua_State* tolua_S) { - tolua_usertype(tolua_S,"Nonexistent"); + tolua_usertype(tolua_S,"Terrain"); + tolua_usertype(tolua_S,"City"); + tolua_usertype(tolua_S,"Disaster"); + tolua_usertype(tolua_S,"Unit_Type"); tolua_usertype(tolua_S,"Direction"); tolua_usertype(tolua_S,"Nation_Type"); + tolua_usertype(tolua_S,"Connection"); + tolua_usertype(tolua_S,"Government"); tolua_usertype(tolua_S,"City_List_Link"); - tolua_usertype(tolua_S,"Building_Type"); - tolua_usertype(tolua_S,"Terrain"); - tolua_usertype(tolua_S,"Tech_Type"); - tolua_usertype(tolua_S,"Unit"); tolua_usertype(tolua_S,"Unit_List_Link"); - tolua_usertype(tolua_S,"Connection"); - tolua_usertype(tolua_S,"Disaster"); - tolua_usertype(tolua_S,"City"); - tolua_usertype(tolua_S,"Unit_Type"); + tolua_usertype(tolua_S,"Nonexistent"); + tolua_usertype(tolua_S,"Tech_Type"); + tolua_usertype(tolua_S,"Building_Type"); tolua_usertype(tolua_S,"Tile"); - tolua_usertype(tolua_S,"Government"); + tolua_usertype(tolua_S,"Unit"); tolua_usertype(tolua_S,"Player"); } diff -Nru freeciv-2.5.7/common/scriptcore/tolua_game_gen.h freeciv-2.5.8/common/scriptcore/tolua_game_gen.h --- freeciv-2.5.7/common/scriptcore/tolua_game_gen.h 2017-05-13 12:00:57.000000000 +0000 +++ freeciv-2.5.8/common/scriptcore/tolua_game_gen.h 2017-08-12 11:51:19.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: game -** Generated automatically by tolua 5.2.0 on Sat May 13 13:00:57 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/common/scriptcore/tolua_signal_gen.h freeciv-2.5.8/common/scriptcore/tolua_signal_gen.h --- freeciv-2.5.7/common/scriptcore/tolua_signal_gen.h 2017-05-13 12:00:57.000000000 +0000 +++ freeciv-2.5.8/common/scriptcore/tolua_signal_gen.h 2017-08-12 11:51:19.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: signal -** Generated automatically by tolua 5.2.0 on Sat May 13 13:00:57 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:51:19 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/common/unit.c freeciv-2.5.8/common/unit.c --- freeciv-2.5.7/common/unit.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/common/unit.c 2017-08-12 11:47:30.000000000 +0000 @@ -606,15 +606,15 @@ already done by this unit. **************************************************************************/ int get_turns_for_activity_at(const struct unit *punit, - enum unit_activity activity, - const struct tile *ptile) + enum unit_activity activity, + const struct tile *ptile) { /* FIXME: This is just an approximation since we don't account for * get_activity_rate_this_turn. */ int speed = get_activity_rate(punit); int time = tile_activity_time(activity, ptile); - if (time >= 0 && speed >= 0) { + if (time >= 0 && speed > 0) { return (time - 1) / speed + 1; /* round up */ } else { return FC_INFINITY; diff -Nru freeciv-2.5.7/common/version.c freeciv-2.5.8/common/version.c --- freeciv-2.5.7/common/version.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/common/version.c 2017-08-12 11:47:30.000000000 +0000 @@ -25,10 +25,6 @@ #include "version.h" -#ifdef SVNREV -#include "fc_svnrev_gen.h" -#endif /* SVNREV */ - #ifdef GITREV #include "fc_gitrev_gen.h" #endif /* GITREV */ @@ -43,9 +39,6 @@ #if IS_BETA_VERSION fc_snprintf(msgbuf, sizeof (msgbuf), _("Freeciv version %s %s"), VERSION_STRING, _("(beta version)")); -#elif defined(SVNREV) && !defined(FC_SVNREV_OFF) - fc_snprintf(msgbuf, sizeof (msgbuf), _("Freeciv version %s (%s)"), - VERSION_STRING, fc_svn_revision()); #elif defined(GITREV) && !defined(FC_GITREV_OFF) fc_snprintf(msgbuf, sizeof (msgbuf), _("Freeciv version %s (%s)"), VERSION_STRING, fc_git_revision()); @@ -70,25 +63,6 @@ } /********************************************************************** - Returns string with svn revision information if it is possible to - determine. Can return also some fallback string or even NULL. -***********************************************************************/ -const char *fc_svn_revision(void) -{ -#if defined(SVNREV) && !defined(FC_SVNREV_OFF) - static char buf[100]; - bool translate = FC_SVNREV1[0] != '\0'; - - fc_snprintf(buf, sizeof(buf), "%s%s", - translate ? _(FC_SVNREV1) : FC_SVNREV1, FC_SVNREV2); - - return buf; /* Either revision, or modified revision */ -#else /* FC_SVNREV_OFF */ - return NULL; -#endif /* FC_SVNREV_OFF */ -} - -/********************************************************************** Returns string with git revision information if it is possible to determine. Can return also some fallback string or even NULL. ***********************************************************************/ @@ -114,12 +88,7 @@ ***********************************************************************/ const char *fc_comparable_version(void) { -#ifdef FC_SVNREV_ON - /* Sane revision number in FC_SVNREV2 */ - return VERSION_STRING "-" FC_SVNREV2; -#else /* FC_SVNREV_ON */ return VERSION_STRING; -#endif } /********************************************************************** @@ -187,10 +156,7 @@ if (buf[0] == '\0') { const char *ver_rev; - ver_rev = fc_svn_revision(); - if (ver_rev == NULL) { - ver_rev = fc_git_revision(); - } + ver_rev = fc_git_revision(); if (ver_rev != NULL) { fc_snprintf(buf, sizeof(buf), "%s (%s)", VERSION_STRING, ver_rev); } else { diff -Nru freeciv-2.5.7/common/version.h freeciv-2.5.8/common/version.h --- freeciv-2.5.7/common/version.h 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/common/version.h 2017-08-12 11:47:30.000000000 +0000 @@ -32,7 +32,6 @@ /* version informational strings */ const char *freeciv_name_version(void); const char *word_version(void); -const char *fc_svn_revision(void); const char *fc_git_revision(void); const char *fc_comparable_version(void); const char *freeciv_datafile_version(void); diff -Nru freeciv-2.5.7/configure freeciv-2.5.8/configure --- freeciv-2.5.7/configure 2017-05-13 12:00:02.000000000 +0000 +++ freeciv-2.5.8/configure 2017-08-12 11:50:26.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Freeciv 2.5.7. +# Generated by GNU Autoconf 2.69 for Freeciv 2.5.8. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='Freeciv' PACKAGE_TARNAME='freeciv' -PACKAGE_VERSION='2.5.7' -PACKAGE_STRING='Freeciv 2.5.7' +PACKAGE_VERSION='2.5.8' +PACKAGE_STRING='Freeciv 2.5.8' PACKAGE_BUGREPORT='https://www.hostedredmine.com/projects/freeciv' PACKAGE_URL='' @@ -919,8 +919,6 @@ MAKE_DATA_TRUE GITREV_FALSE GITREV_TRUE -SVNREV_FALSE -SVNREV_TRUE MAPIMG_WAND_LIBS MAPIMG_WAND_CFLAGS WAND_LIBS @@ -1078,7 +1076,6 @@ enable_client with_xaw with_xaw3d -enable_svnrev enable_gitrev enable_make_data enable_make_include @@ -1717,7 +1714,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Freeciv 2.5.7 to adapt to many kinds of systems. +\`configure' configures Freeciv 2.5.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1791,7 +1788,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Freeciv 2.5.7:";; + short | recursive ) echo "Configuration of Freeciv 2.5.8:";; esac cat <<\_ACEOF @@ -1815,7 +1812,6 @@ or list) --enable-client=auto/all/gtk2/gtk3/sdl/xaw/qt/stub clients to compile [auto](list for multiple) - --enable-svnrev get svn revision to version information --enable-gitrev get git revision to version information --disable-make-data do not recurse make into data directories --enable-make-include force make to recurse into include directory @@ -2026,7 +2022,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Freeciv configure 2.5.7 +Freeciv configure 2.5.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2844,7 +2840,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Freeciv $as_me 2.5.7, which was +It was created by Freeciv $as_me 2.5.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4873,7 +4869,7 @@ MAJOR_VERSION="2" MINOR_VERSION="5" -PATCH_VERSION="7" +PATCH_VERSION="8" VERSION_LABEL="" # 1) Development until MAJOR and MINOR version numbers are @@ -4930,9 +4926,7 @@ VERSION_LABEL=$(echo $FREECIV_LABEL_FORCE | sed "s//$VERSION_LABEL/g") fi -if test x$VERSION_REVTYPE = xsvn && which svn > /dev/null ; then - VERSION_REV="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 's/^Revision: //')" -elif test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then +if test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then VERSION_REV="$(git rev-parse --short HEAD)" else VERSION_REV="" @@ -5577,7 +5571,7 @@ # Define the identity of the package. PACKAGE='freeciv' - VERSION='2.5.7' + VERSION='2.5.8' cat >>confdefs.h <<_ACEOF @@ -7017,31 +7011,6 @@ as_fn_error $? "Cannot use both --with-xaw and --with-xaw3d at the same time" "$LINENO" 5 fi -# Check whether --enable-svnrev was given. -if test "${enable_svnrev+set}" = set; then : - enableval=$enable_svnrev; case "${enableval}" in - yes) svnrev=true ;; - no) svnrev=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-svnrev" "$LINENO" 5 ;; -esac -else - svnrev=false -fi - - if test x$svnrev = xtrue; then - SVNREV_TRUE= - SVNREV_FALSE='#' -else - SVNREV_TRUE='#' - SVNREV_FALSE= -fi - -if test x$svnrev = xtrue ; then - -$as_echo "#define SVNREV 1" >>confdefs.h - -fi - # Check whether --enable-gitrev was given. if test "${enable_gitrev+set}" = set; then : enableval=$enable_gitrev; case "${enableval}" in @@ -21870,7 +21839,7 @@ accepted_flags="" existing_flags="`eval echo '$'EXTRA_DEBUG_CFLAGS`" -for flag in -pg +for flag in -pg -no-pie do CFLAGS="-Werror $flags_save $existing_flags $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28722,7 +28691,7 @@ do for j in $libggz_header; do - echo "configure: 28725: $i/$j" >&5 + echo "configure: 28694: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -28978,7 +28947,7 @@ do for j in $ggzmod_header; do - echo "configure: 28981: $i/$j" >&5 + echo "configure: 28950: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzmod_incdir=$i @@ -29108,7 +29077,7 @@ do for j in ggz-config; do - echo "configure: 29111: $i/$j" >&5 + echo "configure: 29080: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_config_dir=$i @@ -29337,7 +29306,7 @@ do for j in $ggz_gtk_header; do - echo "configure: 29340: $i/$j" >&5 + echo "configure: 29309: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_gtk_incdir=$i @@ -29529,7 +29498,7 @@ do for j in $libggz_header; do - echo "configure: 29532: $i/$j" >&5 + echo "configure: 29501: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -29781,7 +29750,7 @@ do for j in $ggzdmod_header; do - echo "configure: 29784: $i/$j" >&5 + echo "configure: 29753: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzdmod_incdir=$i @@ -30216,7 +30185,7 @@ do for j in $libggz_header; do - echo "configure: 30219: $i/$j" >&5 + echo "configure: 30188: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -30472,7 +30441,7 @@ do for j in $ggzmod_header; do - echo "configure: 30475: $i/$j" >&5 + echo "configure: 30444: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzmod_incdir=$i @@ -30602,7 +30571,7 @@ do for j in ggz-config; do - echo "configure: 30605: $i/$j" >&5 + echo "configure: 30574: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_config_dir=$i @@ -30831,7 +30800,7 @@ do for j in $ggz_gtk_header; do - echo "configure: 30834: $i/$j" >&5 + echo "configure: 30803: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_gtk_incdir=$i @@ -31023,7 +30992,7 @@ do for j in $libggz_header; do - echo "configure: 31026: $i/$j" >&5 + echo "configure: 30995: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -31275,7 +31244,7 @@ do for j in $ggzdmod_header; do - echo "configure: 31278: $i/$j" >&5 + echo "configure: 31247: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzdmod_incdir=$i @@ -36095,10 +36064,6 @@ as_fn_error $? "conditional \"SERVER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${SVNREV_TRUE}" && test -z "${SVNREV_FALSE}"; then - as_fn_error $? "conditional \"SVNREV\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${GITREV_TRUE}" && test -z "${GITREV_FALSE}"; then as_fn_error $? "conditional \"GITREV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -36620,7 +36585,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Freeciv $as_me 2.5.7, which was +This file was extended by Freeciv $as_me 2.5.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36686,7 +36651,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Freeciv config.status 2.5.7 +Freeciv config.status 2.5.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru freeciv-2.5.7/configure.ac freeciv-2.5.8/configure.ac --- freeciv-2.5.7/configure.ac 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/configure.ac 2017-08-12 11:47:30.000000000 +0000 @@ -328,18 +328,6 @@ AC_MSG_ERROR(Cannot use both --with-xaw and --with-xaw3d at the same time) fi -AC_ARG_ENABLE([svnrev], - AS_HELP_STRING([--enable-svnrev], [get svn revision to version information]), -[case "${enableval}" in - yes) svnrev=true ;; - no) svnrev=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-svnrev]) ;; -esac], [svnrev=false]) -AM_CONDITIONAL([SVNREV], [test x$svnrev = xtrue]) -if test x$svnrev = xtrue ; then - AC_DEFINE([SVNREV], [1], [Get svn revision information to version number]) -fi - AC_ARG_ENABLE([gitrev], AS_HELP_STRING([--enable-gitrev], [get git revision to version information]), [case "${enableval}" in diff -Nru freeciv-2.5.7/data/civ1/cities.ruleset freeciv-2.5.8/data/civ1/cities.ruleset --- freeciv-2.5.7/data/civ1/cities.ruleset 2017-05-13 11:55:08.000000000 +0000 +++ freeciv-2.5.8/data/civ1/cities.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -118,6 +118,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/civ2/cities.ruleset freeciv-2.5.8/data/civ2/cities.ruleset --- freeciv-2.5.7/data/civ2/cities.ruleset 2017-05-13 11:55:08.000000000 +0000 +++ freeciv-2.5.8/data/civ2/cities.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -118,6 +118,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/civ2civ3/cities.ruleset freeciv-2.5.8/data/civ2civ3/cities.ruleset --- freeciv-2.5.7/data/civ2civ3/cities.ruleset 2017-05-13 11:55:14.000000000 +0000 +++ freeciv-2.5.8/data/civ2civ3/cities.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -120,6 +120,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/civ2civ3/terrain.ruleset freeciv-2.5.8/data/civ2civ3/terrain.ruleset --- freeciv-2.5.7/data/civ2civ3/terrain.ruleset 2017-05-13 11:55:14.000000000 +0000 +++ freeciv-2.5.8/data/civ2civ3/terrain.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -440,7 +440,7 @@ identifier = "f" class = "Land" movement_cost = 2 -defense_bonus = 25 +defense_bonus = 20 food = 1 shield = 2 trade = 0 @@ -573,7 +573,7 @@ identifier = "j" class = "Land" movement_cost = 2 -defense_bonus = 25 +defense_bonus = 20 food = 1 shield = 1 trade = 0 @@ -708,7 +708,7 @@ identifier = "s" class = "Land" movement_cost = 2 -defense_bonus = 25 +defense_bonus = 20 food = 1 shield = 0 trade = 0 diff -Nru freeciv-2.5.7/data/civ2civ3/units.ruleset freeciv-2.5.8/data/civ2civ3/units.ruleset --- freeciv-2.5.7/data/civ2civ3/units.ruleset 2017-05-13 11:55:14.000000000 +0000 +++ freeciv-2.5.8/data/civ2civ3/units.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -2460,6 +2460,8 @@ roles = "GameLoss" helptext = _("\ This is you. If you lose this unit, you lose the game. So don't.\ +"), _("\ +Won't unleash barbarians from huts.\ ") [unit_barbarian_leader] diff -Nru freeciv-2.5.7/data/classic/cities.ruleset freeciv-2.5.8/data/classic/cities.ruleset --- freeciv-2.5.7/data/classic/cities.ruleset 2017-05-13 11:55:13.000000000 +0000 +++ freeciv-2.5.8/data/classic/cities.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -117,6 +117,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/classic/units.ruleset freeciv-2.5.8/data/classic/units.ruleset --- freeciv-2.5.7/data/classic/units.ruleset 2017-05-13 11:55:13.000000000 +0000 +++ freeciv-2.5.8/data/classic/units.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -2274,6 +2274,8 @@ roles = "GameLoss" helptext = _("\ This is you. If you lose this unit, you lose the game. So don't.\ +"), _("\ +Won't unleash barbarians from huts.\ ") [unit_barbarian_leader] diff -Nru freeciv-2.5.7/data/default/default.lua freeciv-2.5.8/data/default/default.lua --- freeciv-2.5.7/data/default/default.lua 2017-05-13 11:55:13.000000000 +0000 +++ freeciv-2.5.8/data/default/default.lua 2017-08-12 11:47:31.000000000 +0000 @@ -156,7 +156,7 @@ --[[ Make partisans around conquered city - if requirements to make partisans when a city is conquered is fullfilled + if requirements to make partisans when a city is conquered is fulfilled this routine makes a lot of partisans based on the city`s size. To be candidate for partisans the following things must be satisfied: 1) The loser of the city is the original owner. diff -Nru freeciv-2.5.7/data/experimental/cities.ruleset freeciv-2.5.8/data/experimental/cities.ruleset --- freeciv-2.5.7/data/experimental/cities.ruleset 2017-05-13 11:55:42.000000000 +0000 +++ freeciv-2.5.8/data/experimental/cities.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -119,6 +119,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/experimental/units.ruleset freeciv-2.5.8/data/experimental/units.ruleset --- freeciv-2.5.7/data/experimental/units.ruleset 2017-05-13 11:55:42.000000000 +0000 +++ freeciv-2.5.8/data/experimental/units.ruleset 2017-08-12 11:47:31.000000000 +0000 @@ -2301,6 +2301,8 @@ roles = "GameLoss" helptext = _("\ This is you. If you lose this unit, you lose the game. So don't.\ +"), _("\ +Won't unleash barbarians from huts.\ ") [unit_barbarian_leader] diff -Nru freeciv-2.5.7/data/Freeciv freeciv-2.5.8/data/Freeciv --- freeciv-2.5.7/data/Freeciv 2017-05-13 12:00:27.000000000 +0000 +++ freeciv-2.5.8/data/Freeciv 2017-08-12 11:50:56.000000000 +0000 @@ -5,7 +5,7 @@ ! none widgets resources ! gotAppDefFile MUST be the first entry! Freeciv*gotAppDefFile: True -Freeciv*version: 2.5.7 +Freeciv*version: 2.5.8 Freeciv.title: Freeciv Freeciv.iconName: Freeciv Freeciv*borderColor: black Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/data/isophex/rivers.png and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/data/isophex/rivers.png differ diff -Nru freeciv-2.5.7/data/isophex/rivers.spec freeciv-2.5.8/data/isophex/rivers.spec --- freeciv-2.5.7/data/isophex/rivers.spec 2017-05-13 11:54:11.000000000 +0000 +++ freeciv-2.5.8/data/isophex/rivers.spec 2017-08-12 11:47:32.000000000 +0000 @@ -7,11 +7,12 @@ [info] artists = " - Tim F. Smith - Daniel Speyer (mix) - Frederic Rodrigo (mix) - Andreas Røsdal (hex mode) - Jason Short (hex mixing) + Tim F. Smith + Daniel Speyer (mix) + Frederic Rodrigo (mix) + Andreas Røsdal (hex mode) + Jason Short (hex mixing) + GriffonSpade " [file] @@ -25,76 +26,76 @@ dy = 32 pixel_border = 1 -tiles = { "row", "column","tag" +tiles = { "row", "column", "tag" ; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: - 2, 0, "road.river_s_n0e0se0s0w0nw0" - 2, 1, "road.river_s_n1e0se0s0w0nw0" - 2, 2, "road.river_s_n0e1se0s0w0nw0" - 2, 3, "road.river_s_n1e1se0s0w0nw0" - 2, 4, "road.river_s_n0e0se0s1w0nw0" - 2, 5, "road.river_s_n1e0se0s1w0nw0" - 2, 6, "road.river_s_n0e1se0s1w0nw0" - 2, 7, "road.river_s_n1e1se0s1w0nw0" - 3, 0, "road.river_s_n0e0se0s0w1nw0" - 3, 1, "road.river_s_n1e0se0s0w1nw0" - 3, 2, "road.river_s_n0e1se0s0w1nw0" - 3, 3, "road.river_s_n1e1se0s0w1nw0" - 3, 4, "road.river_s_n0e0se0s1w1nw0" - 3, 5, "road.river_s_n1e0se0s1w1nw0" - 3, 6, "road.river_s_n0e1se0s1w1nw0" - 3, 7, "road.river_s_n1e1se0s1w1nw0" - - 4, 0, "road.river_s_n0e0se1s0w0nw0" - 4, 1, "road.river_s_n1e0se1s0w0nw0" - 4, 2, "road.river_s_n0e1se1s0w0nw0" - 4, 3, "road.river_s_n1e1se1s0w0nw0" - 4, 4, "road.river_s_n0e0se1s1w0nw0" - 4, 5, "road.river_s_n1e0se1s1w0nw0" - 4, 6, "road.river_s_n0e1se1s1w0nw0" - 4, 7, "road.river_s_n1e1se1s1w0nw0" - 5, 0, "road.river_s_n0e0se1s0w1nw0" - 5, 1, "road.river_s_n1e0se1s0w1nw0" - 5, 2, "road.river_s_n0e1se1s0w1nw0" - 5, 3, "road.river_s_n1e1se1s0w1nw0" - 5, 4, "road.river_s_n0e0se1s1w1nw0" - 5, 5, "road.river_s_n1e0se1s1w1nw0" - 5, 6, "road.river_s_n0e1se1s1w1nw0" - 5, 7, "road.river_s_n1e1se1s1w1nw0" - - 6, 0, "road.river_s_n0e0se0s0w0nw1" - 6, 1, "road.river_s_n1e0se0s0w0nw1" - 6, 2, "road.river_s_n0e1se0s0w0nw1" - 6, 3, "road.river_s_n1e1se0s0w0nw1" - 6, 4, "road.river_s_n0e0se0s1w0nw1" - 6, 5, "road.river_s_n1e0se0s1w0nw1" - 6, 6, "road.river_s_n0e1se0s1w0nw1" - 6, 7, "road.river_s_n1e1se0s1w0nw1" - 7, 0, "road.river_s_n0e0se0s0w1nw1" - 7, 1, "road.river_s_n1e0se0s0w1nw1" - 7, 2, "road.river_s_n0e1se0s0w1nw1" - 7, 3, "road.river_s_n1e1se0s0w1nw1" - 7, 4, "road.river_s_n0e0se0s1w1nw1" - 7, 5, "road.river_s_n1e0se0s1w1nw1" - 7, 6, "road.river_s_n0e1se0s1w1nw1" - 7, 7, "road.river_s_n1e1se0s1w1nw1" - - 8, 0, "road.river_s_n0e0se1s0w0nw1" - 8, 1, "road.river_s_n1e0se1s0w0nw1" - 8, 2, "road.river_s_n0e1se1s0w0nw1" - 8, 3, "road.river_s_n1e1se1s0w0nw1" - 8, 4, "road.river_s_n0e0se1s1w0nw1" - 8, 5, "road.river_s_n1e0se1s1w0nw1" - 8, 6, "road.river_s_n0e1se1s1w0nw1" - 8, 7, "road.river_s_n1e1se1s1w0nw1" - 9, 0, "road.river_s_n0e0se1s0w1nw1" - 9, 1, "road.river_s_n1e0se1s0w1nw1" - 9, 2, "road.river_s_n0e1se1s0w1nw1" - 9, 3, "road.river_s_n1e1se1s0w1nw1" - 9, 4, "road.river_s_n0e0se1s1w1nw1" - 9, 5, "road.river_s_n1e0se1s1w1nw1" - 9, 6, "road.river_s_n0e1se1s1w1nw1" - 9, 7, "road.river_s_n1e1se1s1w1nw1" + 0, 0, "road.river_s_n0e0se0s0w0nw0" + 0, 1, "road.river_s_n1e0se0s0w0nw0" + 0, 2, "road.river_s_n0e1se0s0w0nw0" + 0, 3, "road.river_s_n1e1se0s0w0nw0" + 0, 4, "road.river_s_n0e0se0s1w0nw0" + 0, 5, "road.river_s_n1e0se0s1w0nw0" + 0, 6, "road.river_s_n0e1se0s1w0nw0" + 0, 7, "road.river_s_n1e1se0s1w0nw0" + 1, 0, "road.river_s_n0e0se0s0w1nw0" + 1, 1, "road.river_s_n1e0se0s0w1nw0" + 1, 2, "road.river_s_n0e1se0s0w1nw0" + 1, 3, "road.river_s_n1e1se0s0w1nw0" + 1, 4, "road.river_s_n0e0se0s1w1nw0" + 1, 5, "road.river_s_n1e0se0s1w1nw0" + 1, 6, "road.river_s_n0e1se0s1w1nw0" + 1, 7, "road.river_s_n1e1se0s1w1nw0" + + 2, 0, "road.river_s_n0e0se1s0w0nw0" + 2, 1, "road.river_s_n1e0se1s0w0nw0" + 2, 2, "road.river_s_n0e1se1s0w0nw0" + 2, 3, "road.river_s_n1e1se1s0w0nw0" + 2, 4, "road.river_s_n0e0se1s1w0nw0" + 2, 5, "road.river_s_n1e0se1s1w0nw0" + 2, 6, "road.river_s_n0e1se1s1w0nw0" + 2, 7, "road.river_s_n1e1se1s1w0nw0" + 3, 0, "road.river_s_n0e0se1s0w1nw0" + 3, 1, "road.river_s_n1e0se1s0w1nw0" + 3, 2, "road.river_s_n0e1se1s0w1nw0" + 3, 3, "road.river_s_n1e1se1s0w1nw0" + 3, 4, "road.river_s_n0e0se1s1w1nw0" + 3, 5, "road.river_s_n1e0se1s1w1nw0" + 3, 6, "road.river_s_n0e1se1s1w1nw0" + 3, 7, "road.river_s_n1e1se1s1w1nw0" + + 4, 0, "road.river_s_n0e0se0s0w0nw1" + 4, 1, "road.river_s_n1e0se0s0w0nw1" + 4, 2, "road.river_s_n0e1se0s0w0nw1" + 4, 3, "road.river_s_n1e1se0s0w0nw1" + 4, 4, "road.river_s_n0e0se0s1w0nw1" + 4, 5, "road.river_s_n1e0se0s1w0nw1" + 4, 6, "road.river_s_n0e1se0s1w0nw1" + 4, 7, "road.river_s_n1e1se0s1w0nw1" + 5, 0, "road.river_s_n0e0se0s0w1nw1" + 5, 1, "road.river_s_n1e0se0s0w1nw1" + 5, 2, "road.river_s_n0e1se0s0w1nw1" + 5, 3, "road.river_s_n1e1se0s0w1nw1" + 5, 4, "road.river_s_n0e0se0s1w1nw1" + 5, 5, "road.river_s_n1e0se0s1w1nw1" + 5, 6, "road.river_s_n0e1se0s1w1nw1" + 5, 7, "road.river_s_n1e1se0s1w1nw1" + + 6, 0, "road.river_s_n0e0se1s0w0nw1" + 6, 1, "road.river_s_n1e0se1s0w0nw1" + 6, 2, "road.river_s_n0e1se1s0w0nw1" + 6, 3, "road.river_s_n1e1se1s0w0nw1" + 6, 4, "road.river_s_n0e0se1s1w0nw1" + 6, 5, "road.river_s_n1e0se1s1w0nw1" + 6, 6, "road.river_s_n0e1se1s1w0nw1" + 6, 7, "road.river_s_n1e1se1s1w0nw1" + 7, 0, "road.river_s_n0e0se1s0w1nw1" + 7, 1, "road.river_s_n1e0se1s0w1nw1" + 7, 2, "road.river_s_n0e1se1s0w1nw1" + 7, 3, "road.river_s_n1e1se1s0w1nw1" + 7, 4, "road.river_s_n0e0se1s1w1nw1" + 7, 5, "road.river_s_n1e0se1s1w1nw1" + 7, 6, "road.river_s_n0e1se1s1w1nw1" + 7, 7, "road.river_s_n1e1se1s1w1nw1" } Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/data/isophex/terrain1.png and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/data/isophex/terrain1.png differ diff -Nru freeciv-2.5.7/data/isophex/terrain1.spec freeciv-2.5.8/data/isophex/terrain1.spec --- freeciv-2.5.7/data/isophex/terrain1.spec 2017-05-13 11:54:11.000000000 +0000 +++ freeciv-2.5.8/data/isophex/terrain1.spec 2017-08-12 11:47:32.000000000 +0000 @@ -7,9 +7,10 @@ [info] artists = " - Tim F. Smith - Andreas Røsdal (hex mode) - Daniel Speyer + Tim F. Smith + Andreas Røsdal (hex mode) + Daniel Speyer + GriffonSpade " [file] @@ -25,146 +26,116 @@ tiles = { "row", "column","tag" -; terrain - 0, 0, "t.l0.desert1" -; 0, 1, "t.l0.desert2" - - 1, 0, "t.l0.plains1" -; 1, 1, "t.l0.plains2" - - 2, 0, "t.l0.grassland1" -; 2, 1, "t.l0.grassland2" - - 3, 0, "t.l0.forest1" -; 3, 1, "t.l0.forest2" - - 4, 0, "t.l0.hills1" -; 4, 1, "t.l0.hills2" - - 5, 0, "t.l0.mountains1" -; 5, 1, "t.l0.mountains2" - - 6, 0, "t.l0.tundra1" - - 7, 0, "t.l0.arctic1" - - 8, 0, "t.l0.swamp1" - - 9, 0, "t.l0.jungle1" +; terrain - layer 0 - 10, 0, "t.l0.inaccessible1" + 0, 0, "t.l0.desert1" + 0, 1, "t.l0.plains1" + 0, 2, "t.l0.grassland1" + 0, 3, "t.l0.tundra1" + 0, 4, "t.l0.arctic1" + 0, 5, "t.l0.swamp1" + 0, 6, "t.l0.jungle1" + 0, 2, "t.l0.forest1" + 0, 2, "t.l0.hills1" + 0, 2, "t.l0.mountains1" + 0, 10, "t.l0.inaccessible1" -;currently blank? -; 10, 0, "t.l0.ocean1" ; Terrain special resources: - 0, 2, "ts.oasis" - 0, 3, "ts.oil" - - 1, 2, "ts.buffalo" - 1, 3, "ts.wheat" - - 2, 2, "ts.fish" - 2, 3, "ts.whales" - - 7, 7, "ts.grassland_resources", "ts.river_resources" - - 3, 2, "ts.pheasant" - 3, 3, "ts.silk" + 1, 0, "ts.oil" + 2, 0, "ts.oasis" + 1, 1, "ts.buffalo" + 2, 1, "ts.wheat" + 1, 2, "ts.grassland_resources" + 1, 2, "ts.river_resources" + 2, 2, "ts.pheasant" + 1, 3, "ts.tundra_game" + 2, 3, "ts.furs" + 1, 4, "ts.arctic_ivory" + 2, 4, "ts.arctic_oil" + 1, 5, "ts.peat" + 2, 5, "ts.spice" + 1, 6, "ts.gems" + 2, 6, "ts.fruit" + 1, 7, "ts.forest_game" + 2, 7, "ts.silk" + 1, 8, "ts.coal" + 2, 8, "ts.wine" + 1, 9, "ts.gold" + 2, 9, "ts.iron" + 1, 10, "ts.fish" + 2, 10, "ts.whales" + + 3, 6, "ts.seals" + +; Strategic Resources + + 3, 0, "ts.saltpeter" + 3, 1, "ts.aluminum" + 3, 2, "ts.uranium" + 3, 3, "ts.horses" + 3, 4, "ts.elephant" + 3, 5, "ts.rubber" - 4, 2, "ts.coal" - 4, 3, "ts.wine" - - 5, 2, "ts.gold" - 5, 3, "ts.iron" - - 6, 2, "ts.tundra_game" - 6, 3, "ts.furs" +; Roads - 7, 2, "ts.arctic_ivory" - 7, 3, "ts.arctic_oil" + 6, 0, "road.road_isolated" + 6, 1, "road.road_n" + 6, 2, "road.road_ne" + 6, 3, "road.road_e" + 6, 4, "road.road_se" + 6, 5, "road.road_s" + 6, 6, "road.road_sw" + 6, 7, "road.road_w" + 6, 8, "road.road_nw" - 8, 2, "ts.peat" - 8, 3, "ts.spice" +; Rails - 9, 2, "ts.gems" - 9, 3, "ts.fruit" - 9, 4, "ts.horses" - 9, 5, "ts.seals" - 9, 6, "ts.forest_game" + 7, 0, "road.rail_isolated" + 7, 1, "road.rail_n" + 7, 2, "road.rail_ne" + 7, 3, "road.rail_e" + 7, 4, "road.rail_se" + 7, 5, "road.rail_s" + 7, 6, "road.rail_sw" + 7, 7, "road.rail_w" + 7, 8, "road.rail_nw" ; Maglevs - 10, 1, "road.maglev_n" - 10, 2, "road.maglev_ne" - 10, 3, "road.maglev_e" - 10, 4, "road.maglev_se" - 10, 5, "road.maglev_s" - 10, 6, "road.maglev_sw" - 10, 7, "road.maglev_w" - 10, 8, "road.maglev_nw" - -; Roads - 11, 1, "road.road_n" - 11, 2, "road.road_ne" - 11, 3, "road.road_e" - 11, 4, "road.road_se" - 11, 5, "road.road_s" - 11, 6, "road.road_sw" - 11, 7, "road.road_w" - 11, 8, "road.road_nw" -; Rails - 12, 1, "road.rail_n" - 12, 2, "road.rail_ne" - 12, 3, "road.rail_e" - 12, 4, "road.rail_se" - 12, 5, "road.rail_s" - 12, 6, "road.rail_sw" - 12, 7, "road.rail_w" - 12, 8, "road.rail_nw" + 8, 0, "road.maglev_isolated" + 8, 1, "road.maglev_n" + 8, 2, "road.maglev_ne" + 8, 3, "road.maglev_e" + 8, 4, "road.maglev_se" + 8, 5, "road.maglev_s" + 8, 6, "road.maglev_sw" + 8, 7, "road.maglev_w" + 8, 8, "road.maglev_nw" ;add-ons - 2, 7, "tx.oil_mine" - 4, 7, "tx.farmland" - 3, 7, "tx.irrigation" - 5, 7, "tx.mine" - 6, 7, "tx.pollution" - 8, 7, "tx.village" - 9, 7, "tx.fallout" -} - - -[grid_extra] - -x_top_left = 1 -y_top_left = 447 -dx = 64 -dy = 32 -pixel_border = 1 -tiles = { "row", "column","tag" - 0, 0, "t.dither_tile" - 0, 0, "tx.darkness" - 0, 2, "mask.tile" - 0, 3, "t.coast_color" - 0, 3, "t.blend.coast" - 0, 3, "t.blend.ocean" - 0, 4, "user.attention" - 0, 5, "tx.fog" -} - - -[grid_isolated] - -x_top_left = 380 -y_top_left = 1 -dx = 64 -dy = 32 -pixel_border = 1 + 4, 0, "tx.oil_mine" + 4, 1, "tx.oil_rig" + 4, 2, "tx.mine" + 4, 3, "tx.irrigation" + 4, 4, "tx.farmland" + 4, 5, "tx.fallout" + 4, 6, "tx.pollution" + 4, 7, "tx.village" + +; misc + + 5, 0, "t.coast_color" + 5, 0, "t.blend.lake" + 5, 0, "t.blend.coast" + 5, 0, "t.blend.floor" + 5, 0, "t.blend.ocean" + 5, 1, "t.dither_tile" + 5, 1, "tx.darkness" + 5, 3, "user.attention" + 5, 4, "tx.fog" + 5, 5, "mask.tile" -tiles = { "row", "column","tag" - 0, 0, "road.road_isolated" - 1, 0, "road.rail_isolated" - 2, 0, "road.maglev_isolated" } Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/data/isophex/terrain2.png and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/data/isophex/terrain2.png differ diff -Nru freeciv-2.5.7/data/isophex/terrain2.spec freeciv-2.5.8/data/isophex/terrain2.spec --- freeciv-2.5.7/data/isophex/terrain2.spec 2017-05-13 11:54:11.000000000 +0000 +++ freeciv-2.5.8/data/isophex/terrain2.spec 2017-08-12 11:47:32.000000000 +0000 @@ -7,10 +7,11 @@ [info] artists = " - Tim F. Smith - Daniel Speyer (mix) - Frederic Rodrigo (mix) - Andreas Røsdal (hex mode) + Tim F. Smith + Daniel Speyer (mix) + Frederic Rodrigo (mix) + Andreas Røsdal (hex mode) + GriffonSpade " [file] @@ -25,224 +26,228 @@ pixel_border = 1 tiles = { "row", "column","tag" -; Rivers are in rivers.spec ;forests as overlay - 4, 0, "t.l1.forest_n0e0se0s0w0nw0" - 4, 1, "t.l1.forest_n1e0se0s0w0nw0" - 4, 2, "t.l1.forest_n0e1se0s0w0nw0" - 4, 3, "t.l1.forest_n1e1se0s0w0nw0" - 4, 4, "t.l1.forest_n0e0se0s1w0nw0" - 4, 5, "t.l1.forest_n1e0se0s1w0nw0" - 4, 6, "t.l1.forest_n0e1se0s1w0nw0" - 4, 7, "t.l1.forest_n1e1se0s1w0nw0" - 5, 0, "t.l1.forest_n0e0se0s0w1nw0" - 5, 1, "t.l1.forest_n1e0se0s0w1nw0" - 5, 2, "t.l1.forest_n0e1se0s0w1nw0" - 5, 3, "t.l1.forest_n1e1se0s0w1nw0" - 5, 4, "t.l1.forest_n0e0se0s1w1nw0" - 5, 5, "t.l1.forest_n1e0se0s1w1nw0" - 5, 6, "t.l1.forest_n0e1se0s1w1nw0" - 5, 7, "t.l1.forest_n1e1se0s1w1nw0" + 0, 0, "t.l1.forest_n0e0se0s0w0nw0" + 0, 1, "t.l1.forest_n1e0se0s0w0nw0" + 0, 2, "t.l1.forest_n0e1se0s0w0nw0" + 0, 3, "t.l1.forest_n1e1se0s0w0nw0" + 0, 4, "t.l1.forest_n0e0se0s1w0nw0" + 0, 5, "t.l1.forest_n1e0se0s1w0nw0" + 0, 6, "t.l1.forest_n0e1se0s1w0nw0" + 0, 7, "t.l1.forest_n1e1se0s1w0nw0" + 1, 0, "t.l1.forest_n0e0se0s0w1nw0" + 1, 1, "t.l1.forest_n1e0se0s0w1nw0" + 1, 2, "t.l1.forest_n0e1se0s0w1nw0" + 1, 3, "t.l1.forest_n1e1se0s0w1nw0" + 1, 4, "t.l1.forest_n0e0se0s1w1nw0" + 1, 5, "t.l1.forest_n1e0se0s1w1nw0" + 1, 6, "t.l1.forest_n0e1se0s1w1nw0" + 1, 7, "t.l1.forest_n1e1se0s1w1nw0" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - 4, 0, "t.l1.forest_n0e0se0s0w0nw1" - 4, 1, "t.l1.forest_n1e0se0s0w0nw1" - 4, 2, "t.l1.forest_n0e1se0s0w0nw1" - 4, 3, "t.l1.forest_n1e1se0s0w0nw1" - 4, 4, "t.l1.forest_n0e0se0s1w0nw1" - 4, 5, "t.l1.forest_n1e0se0s1w0nw1" - 4, 6, "t.l1.forest_n0e1se0s1w0nw1" - 4, 7, "t.l1.forest_n1e1se0s1w0nw1" - 5, 0, "t.l1.forest_n0e0se0s0w1nw1" - 5, 1, "t.l1.forest_n1e0se0s0w1nw1" - 5, 2, "t.l1.forest_n0e1se0s0w1nw1" - 5, 3, "t.l1.forest_n1e1se0s0w1nw1" - 5, 4, "t.l1.forest_n0e0se0s1w1nw1" - 5, 5, "t.l1.forest_n1e0se0s1w1nw1" - 5, 6, "t.l1.forest_n0e1se0s1w1nw1" - 5, 7, "t.l1.forest_n1e1se0s1w1nw1" - 4, 0, "t.l1.forest_n0e0se1s0w0nw0" - 4, 1, "t.l1.forest_n1e0se1s0w0nw0" - 4, 2, "t.l1.forest_n0e1se1s0w0nw0" - 4, 3, "t.l1.forest_n1e1se1s0w0nw0" - 4, 4, "t.l1.forest_n0e0se1s1w0nw0" - 4, 5, "t.l1.forest_n1e0se1s1w0nw0" - 4, 6, "t.l1.forest_n0e1se1s1w0nw0" - 4, 7, "t.l1.forest_n1e1se1s1w0nw0" - 5, 0, "t.l1.forest_n0e0se1s0w1nw0" - 5, 1, "t.l1.forest_n1e0se1s0w1nw0" - 5, 2, "t.l1.forest_n0e1se1s0w1nw0" - 5, 3, "t.l1.forest_n1e1se1s0w1nw0" - 5, 4, "t.l1.forest_n0e0se1s1w1nw0" - 5, 5, "t.l1.forest_n1e0se1s1w1nw0" - 5, 6, "t.l1.forest_n0e1se1s1w1nw0" - 5, 7, "t.l1.forest_n1e1se1s1w1nw0" - 4, 0, "t.l1.forest_n0e0se1s0w0nw1" - 4, 1, "t.l1.forest_n1e0se1s0w0nw1" - 4, 2, "t.l1.forest_n0e1se1s0w0nw1" - 4, 3, "t.l1.forest_n1e1se1s0w0nw1" - 4, 4, "t.l1.forest_n0e0se1s1w0nw1" - 4, 5, "t.l1.forest_n1e0se1s1w0nw1" - 4, 6, "t.l1.forest_n0e1se1s1w0nw1" - 4, 7, "t.l1.forest_n1e1se1s1w0nw1" - 5, 0, "t.l1.forest_n0e0se1s0w1nw1" - 5, 1, "t.l1.forest_n1e0se1s0w1nw1" - 5, 2, "t.l1.forest_n0e1se1s0w1nw1" - 5, 3, "t.l1.forest_n1e1se1s0w1nw1" - 5, 4, "t.l1.forest_n0e0se1s1w1nw1" - 5, 5, "t.l1.forest_n1e0se1s1w1nw1" - 5, 6, "t.l1.forest_n0e1se1s1w1nw1" - 5, 7, "t.l1.forest_n1e1se1s1w1nw1" + + 0, 0, "t.l1.forest_n0e0se0s0w0nw1" + 0, 1, "t.l1.forest_n1e0se0s0w0nw1" + 0, 2, "t.l1.forest_n0e1se0s0w0nw1" + 0, 3, "t.l1.forest_n1e1se0s0w0nw1" + 0, 4, "t.l1.forest_n0e0se0s1w0nw1" + 0, 5, "t.l1.forest_n1e0se0s1w0nw1" + 0, 6, "t.l1.forest_n0e1se0s1w0nw1" + 0, 7, "t.l1.forest_n1e1se0s1w0nw1" + 1, 0, "t.l1.forest_n0e0se0s0w1nw1" + 1, 1, "t.l1.forest_n1e0se0s0w1nw1" + 1, 2, "t.l1.forest_n0e1se0s0w1nw1" + 1, 3, "t.l1.forest_n1e1se0s0w1nw1" + 1, 4, "t.l1.forest_n0e0se0s1w1nw1" + 1, 5, "t.l1.forest_n1e0se0s1w1nw1" + 1, 6, "t.l1.forest_n0e1se0s1w1nw1" + 1, 7, "t.l1.forest_n1e1se0s1w1nw1" + 0, 0, "t.l1.forest_n0e0se1s0w0nw0" + 0, 1, "t.l1.forest_n1e0se1s0w0nw0" + 0, 2, "t.l1.forest_n0e1se1s0w0nw0" + 0, 3, "t.l1.forest_n1e1se1s0w0nw0" + 0, 4, "t.l1.forest_n0e0se1s1w0nw0" + 0, 5, "t.l1.forest_n1e0se1s1w0nw0" + 0, 6, "t.l1.forest_n0e1se1s1w0nw0" + 0, 7, "t.l1.forest_n1e1se1s1w0nw0" + 1, 0, "t.l1.forest_n0e0se1s0w1nw0" + 1, 1, "t.l1.forest_n1e0se1s0w1nw0" + 1, 2, "t.l1.forest_n0e1se1s0w1nw0" + 1, 3, "t.l1.forest_n1e1se1s0w1nw0" + 1, 4, "t.l1.forest_n0e0se1s1w1nw0" + 1, 5, "t.l1.forest_n1e0se1s1w1nw0" + 1, 6, "t.l1.forest_n0e1se1s1w1nw0" + 1, 7, "t.l1.forest_n1e1se1s1w1nw0" + 0, 0, "t.l1.forest_n0e0se1s0w0nw1" + 0, 1, "t.l1.forest_n1e0se1s0w0nw1" + 0, 2, "t.l1.forest_n0e1se1s0w0nw1" + 0, 3, "t.l1.forest_n1e1se1s0w0nw1" + 0, 4, "t.l1.forest_n0e0se1s1w0nw1" + 0, 5, "t.l1.forest_n1e0se1s1w0nw1" + 0, 6, "t.l1.forest_n0e1se1s1w0nw1" + 0, 7, "t.l1.forest_n1e1se1s1w0nw1" + 1, 0, "t.l1.forest_n0e0se1s0w1nw1" + 1, 1, "t.l1.forest_n1e0se1s0w1nw1" + 1, 2, "t.l1.forest_n0e1se1s0w1nw1" + 1, 3, "t.l1.forest_n1e1se1s0w1nw1" + 1, 4, "t.l1.forest_n0e0se1s1w1nw1" + 1, 5, "t.l1.forest_n1e0se1s1w1nw1" + 1, 6, "t.l1.forest_n0e1se1s1w1nw1" + 1, 7, "t.l1.forest_n1e1se1s1w1nw1" ;mountains as overlay - 6, 0, "t.l1.mountains_n0e0se0s0w0nw0" - 6, 1, "t.l1.mountains_n1e0se0s0w0nw0" - 6, 2, "t.l1.mountains_n0e1se0s0w0nw0" - 6, 3, "t.l1.mountains_n1e1se0s0w0nw0" - 6, 4, "t.l1.mountains_n0e0se0s1w0nw0" - 6, 5, "t.l1.mountains_n1e0se0s1w0nw0" - 6, 6, "t.l1.mountains_n0e1se0s1w0nw0" - 6, 7, "t.l1.mountains_n1e1se0s1w0nw0" - 7, 0, "t.l1.mountains_n0e0se0s0w1nw0" - 7, 1, "t.l1.mountains_n1e0se0s0w1nw0" - 7, 2, "t.l1.mountains_n0e1se0s0w1nw0" - 7, 3, "t.l1.mountains_n1e1se0s0w1nw0" - 7, 4, "t.l1.mountains_n0e0se0s1w1nw0" - 7, 5, "t.l1.mountains_n1e0se0s1w1nw0" - 7, 6, "t.l1.mountains_n0e1se0s1w1nw0" - 7, 7, "t.l1.mountains_n1e1se0s1w1nw0" + 2, 0, "t.l1.mountains_n0e0se0s0w0nw0" + 2, 1, "t.l1.mountains_n1e0se0s0w0nw0" + 2, 2, "t.l1.mountains_n0e1se0s0w0nw0" + 2, 3, "t.l1.mountains_n1e1se0s0w0nw0" + 2, 4, "t.l1.mountains_n0e0se0s1w0nw0" + 2, 5, "t.l1.mountains_n1e0se0s1w0nw0" + 2, 6, "t.l1.mountains_n0e1se0s1w0nw0" + 2, 7, "t.l1.mountains_n1e1se0s1w0nw0" + 3, 0, "t.l1.mountains_n0e0se0s0w1nw0" + 3, 1, "t.l1.mountains_n1e0se0s0w1nw0" + 3, 2, "t.l1.mountains_n0e1se0s0w1nw0" + 3, 3, "t.l1.mountains_n1e1se0s0w1nw0" + 3, 4, "t.l1.mountains_n0e0se0s1w1nw0" + 3, 5, "t.l1.mountains_n1e0se0s1w1nw0" + 3, 6, "t.l1.mountains_n0e1se0s1w1nw0" + 3, 7, "t.l1.mountains_n1e1se0s1w1nw0" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - 6, 0, "t.l1.mountains_n0e0se0s0w0nw1" - 6, 1, "t.l1.mountains_n1e0se0s0w0nw1" - 6, 2, "t.l1.mountains_n0e1se0s0w0nw1" - 6, 3, "t.l1.mountains_n1e1se0s0w0nw1" - 6, 4, "t.l1.mountains_n0e0se0s1w0nw1" - 6, 5, "t.l1.mountains_n1e0se0s1w0nw1" - 6, 6, "t.l1.mountains_n0e1se0s1w0nw1" - 6, 7, "t.l1.mountains_n1e1se0s1w0nw1" - 7, 0, "t.l1.mountains_n0e0se0s0w1nw1" - 7, 1, "t.l1.mountains_n1e0se0s0w1nw1" - 7, 2, "t.l1.mountains_n0e1se0s0w1nw1" - 7, 3, "t.l1.mountains_n1e1se0s0w1nw1" - 7, 4, "t.l1.mountains_n0e0se0s1w1nw1" - 7, 5, "t.l1.mountains_n1e0se0s1w1nw1" - 7, 6, "t.l1.mountains_n0e1se0s1w1nw1" - 7, 7, "t.l1.mountains_n1e1se0s1w1nw1" - 6, 0, "t.l1.mountains_n0e0se1s0w0nw0" - 6, 1, "t.l1.mountains_n1e0se1s0w0nw0" - 6, 2, "t.l1.mountains_n0e1se1s0w0nw0" - 6, 3, "t.l1.mountains_n1e1se1s0w0nw0" - 6, 4, "t.l1.mountains_n0e0se1s1w0nw0" - 6, 5, "t.l1.mountains_n1e0se1s1w0nw0" - 6, 6, "t.l1.mountains_n0e1se1s1w0nw0" - 6, 7, "t.l1.mountains_n1e1se1s1w0nw0" - 7, 0, "t.l1.mountains_n0e0se1s0w1nw0" - 7, 1, "t.l1.mountains_n1e0se1s0w1nw0" - 7, 2, "t.l1.mountains_n0e1se1s0w1nw0" - 7, 3, "t.l1.mountains_n1e1se1s0w1nw0" - 7, 4, "t.l1.mountains_n0e0se1s1w1nw0" - 7, 5, "t.l1.mountains_n1e0se1s1w1nw0" - 7, 6, "t.l1.mountains_n0e1se1s1w1nw0" - 7, 7, "t.l1.mountains_n1e1se1s1w1nw0" - 6, 0, "t.l1.mountains_n0e0se1s0w0nw1" - 6, 1, "t.l1.mountains_n1e0se1s0w0nw1" - 6, 2, "t.l1.mountains_n0e1se1s0w0nw1" - 6, 3, "t.l1.mountains_n1e1se1s0w0nw1" - 6, 4, "t.l1.mountains_n0e0se1s1w0nw1" - 6, 5, "t.l1.mountains_n1e0se1s1w0nw1" - 6, 6, "t.l1.mountains_n0e1se1s1w0nw1" - 6, 7, "t.l1.mountains_n1e1se1s1w0nw1" - 7, 0, "t.l1.mountains_n0e0se1s0w1nw1" - 7, 1, "t.l1.mountains_n1e0se1s0w1nw1" - 7, 2, "t.l1.mountains_n0e1se1s0w1nw1" - 7, 3, "t.l1.mountains_n1e1se1s0w1nw1" - 7, 4, "t.l1.mountains_n0e0se1s1w1nw1" - 7, 5, "t.l1.mountains_n1e0se1s1w1nw1" - 7, 6, "t.l1.mountains_n0e1se1s1w1nw1" - 7, 7, "t.l1.mountains_n1e1se1s1w1nw1" + + 2, 0, "t.l1.mountains_n0e0se0s0w0nw1" + 2, 1, "t.l1.mountains_n1e0se0s0w0nw1" + 2, 2, "t.l1.mountains_n0e1se0s0w0nw1" + 2, 3, "t.l1.mountains_n1e1se0s0w0nw1" + 2, 4, "t.l1.mountains_n0e0se0s1w0nw1" + 2, 5, "t.l1.mountains_n1e0se0s1w0nw1" + 2, 6, "t.l1.mountains_n0e1se0s1w0nw1" + 2, 7, "t.l1.mountains_n1e1se0s1w0nw1" + 3, 0, "t.l1.mountains_n0e0se0s0w1nw1" + 3, 1, "t.l1.mountains_n1e0se0s0w1nw1" + 3, 2, "t.l1.mountains_n0e1se0s0w1nw1" + 3, 3, "t.l1.mountains_n1e1se0s0w1nw1" + 3, 4, "t.l1.mountains_n0e0se0s1w1nw1" + 3, 5, "t.l1.mountains_n1e0se0s1w1nw1" + 3, 6, "t.l1.mountains_n0e1se0s1w1nw1" + 3, 7, "t.l1.mountains_n1e1se0s1w1nw1" + 2, 0, "t.l1.mountains_n0e0se1s0w0nw0" + 2, 1, "t.l1.mountains_n1e0se1s0w0nw0" + 2, 2, "t.l1.mountains_n0e1se1s0w0nw0" + 2, 3, "t.l1.mountains_n1e1se1s0w0nw0" + 2, 4, "t.l1.mountains_n0e0se1s1w0nw0" + 2, 5, "t.l1.mountains_n1e0se1s1w0nw0" + 2, 6, "t.l1.mountains_n0e1se1s1w0nw0" + 2, 7, "t.l1.mountains_n1e1se1s1w0nw0" + 3, 0, "t.l1.mountains_n0e0se1s0w1nw0" + 3, 1, "t.l1.mountains_n1e0se1s0w1nw0" + 3, 2, "t.l1.mountains_n0e1se1s0w1nw0" + 3, 3, "t.l1.mountains_n1e1se1s0w1nw0" + 3, 4, "t.l1.mountains_n0e0se1s1w1nw0" + 3, 5, "t.l1.mountains_n1e0se1s1w1nw0" + 3, 6, "t.l1.mountains_n0e1se1s1w1nw0" + 3, 7, "t.l1.mountains_n1e1se1s1w1nw0" + 2, 0, "t.l1.mountains_n0e0se1s0w0nw1" + 2, 1, "t.l1.mountains_n1e0se1s0w0nw1" + 2, 2, "t.l1.mountains_n0e1se1s0w0nw1" + 2, 3, "t.l1.mountains_n1e1se1s0w0nw1" + 2, 4, "t.l1.mountains_n0e0se1s1w0nw1" + 2, 5, "t.l1.mountains_n1e0se1s1w0nw1" + 2, 6, "t.l1.mountains_n0e1se1s1w0nw1" + 2, 7, "t.l1.mountains_n1e1se1s1w0nw1" + 3, 0, "t.l1.mountains_n0e0se1s0w1nw1" + 3, 1, "t.l1.mountains_n1e0se1s0w1nw1" + 3, 2, "t.l1.mountains_n0e1se1s0w1nw1" + 3, 3, "t.l1.mountains_n1e1se1s0w1nw1" + 3, 4, "t.l1.mountains_n0e0se1s1w1nw1" + 3, 5, "t.l1.mountains_n1e0se1s1w1nw1" + 3, 6, "t.l1.mountains_n0e1se1s1w1nw1" + 3, 7, "t.l1.mountains_n1e1se1s1w1nw1" ;hills as overlay - 8, 0, "t.l1.hills_n0e0se0s0w0nw0" - 8, 1, "t.l1.hills_n1e0se0s0w0nw0" - 8, 2, "t.l1.hills_n0e1se0s0w0nw0" - 8, 3, "t.l1.hills_n1e1se0s0w0nw0" - 8, 4, "t.l1.hills_n0e0se0s1w0nw0" - 8, 5, "t.l1.hills_n1e0se0s1w0nw0" - 8, 6, "t.l1.hills_n0e1se0s1w0nw0" - 8, 7, "t.l1.hills_n1e1se0s1w0nw0" - 9, 0, "t.l1.hills_n0e0se0s0w1nw0" - 9, 1, "t.l1.hills_n1e0se0s0w1nw0" - 9, 2, "t.l1.hills_n0e1se0s0w1nw0" - 9, 3, "t.l1.hills_n1e1se0s0w1nw0" - 9, 4, "t.l1.hills_n0e0se0s1w1nw0" - 9, 5, "t.l1.hills_n1e0se0s1w1nw0" - 9, 6, "t.l1.hills_n0e1se0s1w1nw0" - 9, 7, "t.l1.hills_n1e1se0s1w1nw0" + 4, 0, "t.l1.hills_n0e0se0s0w0nw0" + 4, 1, "t.l1.hills_n1e0se0s0w0nw0" + 4, 2, "t.l1.hills_n0e1se0s0w0nw0" + 4, 3, "t.l1.hills_n1e1se0s0w0nw0" + 4, 4, "t.l1.hills_n0e0se0s1w0nw0" + 4, 5, "t.l1.hills_n1e0se0s1w0nw0" + 4, 6, "t.l1.hills_n0e1se0s1w0nw0" + 4, 7, "t.l1.hills_n1e1se0s1w0nw0" + 5, 0, "t.l1.hills_n0e0se0s0w1nw0" + 5, 1, "t.l1.hills_n1e0se0s0w1nw0" + 5, 2, "t.l1.hills_n0e1se0s0w1nw0" + 5, 3, "t.l1.hills_n1e1se0s0w1nw0" + 5, 4, "t.l1.hills_n0e0se0s1w1nw0" + 5, 5, "t.l1.hills_n1e0se0s1w1nw0" + 5, 6, "t.l1.hills_n0e1se0s1w1nw0" + 5, 7, "t.l1.hills_n1e1se0s1w1nw0" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - 8, 0, "t.l1.hills_n0e0se0s0w0nw1" - 8, 1, "t.l1.hills_n1e0se0s0w0nw1" - 8, 2, "t.l1.hills_n0e1se0s0w0nw1" - 8, 3, "t.l1.hills_n1e1se0s0w0nw1" - 8, 4, "t.l1.hills_n0e0se0s1w0nw1" - 8, 5, "t.l1.hills_n1e0se0s1w0nw1" - 8, 6, "t.l1.hills_n0e1se0s1w0nw1" - 8, 7, "t.l1.hills_n1e1se0s1w0nw1" - 9, 0, "t.l1.hills_n0e0se0s0w1nw1" - 9, 1, "t.l1.hills_n1e0se0s0w1nw1" - 9, 2, "t.l1.hills_n0e1se0s0w1nw1" - 9, 3, "t.l1.hills_n1e1se0s0w1nw1" - 9, 4, "t.l1.hills_n0e0se0s1w1nw1" - 9, 5, "t.l1.hills_n1e0se0s1w1nw1" - 9, 6, "t.l1.hills_n0e1se0s1w1nw1" - 9, 7, "t.l1.hills_n1e1se0s1w1nw1" - 8, 0, "t.l1.hills_n0e0se1s0w0nw0" - 8, 1, "t.l1.hills_n1e0se1s0w0nw0" - 8, 2, "t.l1.hills_n0e1se1s0w0nw0" - 8, 3, "t.l1.hills_n1e1se1s0w0nw0" - 8, 4, "t.l1.hills_n0e0se1s1w0nw0" - 8, 5, "t.l1.hills_n1e0se1s1w0nw0" - 8, 6, "t.l1.hills_n0e1se1s1w0nw0" - 8, 7, "t.l1.hills_n1e1se1s1w0nw0" - 9, 0, "t.l1.hills_n0e0se1s0w1nw0" - 9, 1, "t.l1.hills_n1e0se1s0w1nw0" - 9, 2, "t.l1.hills_n0e1se1s0w1nw0" - 9, 3, "t.l1.hills_n1e1se1s0w1nw0" - 9, 4, "t.l1.hills_n0e0se1s1w1nw0" - 9, 5, "t.l1.hills_n1e0se1s1w1nw0" - 9, 6, "t.l1.hills_n0e1se1s1w1nw0" - 9, 7, "t.l1.hills_n1e1se1s1w1nw0" - 8, 0, "t.l1.hills_n0e0se1s0w0nw1" - 8, 1, "t.l1.hills_n1e0se1s0w0nw1" - 8, 2, "t.l1.hills_n0e1se1s0w0nw1" - 8, 3, "t.l1.hills_n1e1se1s0w0nw1" - 8, 4, "t.l1.hills_n0e0se1s1w0nw1" - 8, 5, "t.l1.hills_n1e0se1s1w0nw1" - 8, 6, "t.l1.hills_n0e1se1s1w0nw1" - 8, 7, "t.l1.hills_n1e1se1s1w0nw1" - 9, 0, "t.l1.hills_n0e0se1s0w1nw1" - 9, 1, "t.l1.hills_n1e0se1s0w1nw1" - 9, 2, "t.l1.hills_n0e1se1s0w1nw1" - 9, 3, "t.l1.hills_n1e1se1s0w1nw1" - 9, 4, "t.l1.hills_n0e0se1s1w1nw1" - 9, 5, "t.l1.hills_n1e0se1s1w1nw1" - 9, 6, "t.l1.hills_n0e1se1s1w1nw1" - 9, 7, "t.l1.hills_n1e1se1s1w1nw1" + + 4, 0, "t.l1.hills_n0e0se0s0w0nw1" + 4, 1, "t.l1.hills_n1e0se0s0w0nw1" + 4, 2, "t.l1.hills_n0e1se0s0w0nw1" + 4, 3, "t.l1.hills_n1e1se0s0w0nw1" + 4, 4, "t.l1.hills_n0e0se0s1w0nw1" + 4, 5, "t.l1.hills_n1e0se0s1w0nw1" + 4, 6, "t.l1.hills_n0e1se0s1w0nw1" + 4, 7, "t.l1.hills_n1e1se0s1w0nw1" + 5, 0, "t.l1.hills_n0e0se0s0w1nw1" + 5, 1, "t.l1.hills_n1e0se0s0w1nw1" + 5, 2, "t.l1.hills_n0e1se0s0w1nw1" + 5, 3, "t.l1.hills_n1e1se0s0w1nw1" + 5, 4, "t.l1.hills_n0e0se0s1w1nw1" + 5, 5, "t.l1.hills_n1e0se0s1w1nw1" + 5, 6, "t.l1.hills_n0e1se0s1w1nw1" + 5, 7, "t.l1.hills_n1e1se0s1w1nw1" + 4, 0, "t.l1.hills_n0e0se1s0w0nw0" + 4, 1, "t.l1.hills_n1e0se1s0w0nw0" + 4, 2, "t.l1.hills_n0e1se1s0w0nw0" + 4, 3, "t.l1.hills_n1e1se1s0w0nw0" + 4, 4, "t.l1.hills_n0e0se1s1w0nw0" + 4, 5, "t.l1.hills_n1e0se1s1w0nw0" + 4, 6, "t.l1.hills_n0e1se1s1w0nw0" + 4, 7, "t.l1.hills_n1e1se1s1w0nw0" + 5, 0, "t.l1.hills_n0e0se1s0w1nw0" + 5, 1, "t.l1.hills_n1e0se1s0w1nw0" + 5, 2, "t.l1.hills_n0e1se1s0w1nw0" + 5, 3, "t.l1.hills_n1e1se1s0w1nw0" + 5, 4, "t.l1.hills_n0e0se1s1w1nw0" + 5, 5, "t.l1.hills_n1e0se1s1w1nw0" + 5, 6, "t.l1.hills_n0e1se1s1w1nw0" + 5, 7, "t.l1.hills_n1e1se1s1w1nw0" + 4, 0, "t.l1.hills_n0e0se1s0w0nw1" + 4, 1, "t.l1.hills_n1e0se1s0w0nw1" + 4, 2, "t.l1.hills_n0e1se1s0w0nw1" + 4, 3, "t.l1.hills_n1e1se1s0w0nw1" + 4, 4, "t.l1.hills_n0e0se1s1w0nw1" + 4, 5, "t.l1.hills_n1e0se1s1w0nw1" + 4, 6, "t.l1.hills_n0e1se1s1w0nw1" + 4, 7, "t.l1.hills_n1e1se1s1w0nw1" + 5, 0, "t.l1.hills_n0e0se1s0w1nw1" + 5, 1, "t.l1.hills_n1e0se1s0w1nw1" + 5, 2, "t.l1.hills_n0e1se1s0w1nw1" + 5, 3, "t.l1.hills_n1e1se1s0w1nw1" + 5, 4, "t.l1.hills_n0e0se1s1w1nw1" + 5, 5, "t.l1.hills_n1e0se1s1w1nw1" + 5, 6, "t.l1.hills_n0e1se1s1w1nw1" + 5, 7, "t.l1.hills_n1e1se1s1w1nw1" ; River outlets - 10, 0, "road.river_outlet_n" - 10, 1, "road.river_outlet_e" - 10, 2, "road.river_outlet_s" - 10, 3, "road.river_outlet_w" + 6, 0, "road.river_outlet_n" + 6, 1, "road.river_outlet_e" + 6, 2, "road.river_outlet_s" + 6, 3, "road.river_outlet_w" + 6, 4, "road.river_outlet_se" + 6, 5, "road.river_outlet_nw" } @@ -250,85 +255,125 @@ [grid_coasts] x_top_left = 1 -y_top_left = 429 +y_top_left = 283 dx = 32 dy = 16 pixel_border = 1 tiles = { "row", "column","tag" +; lake cell sprites. See doc/README.graphics + + 0, 0, "t.l0.lake_cell_u000" + 0, 2, "t.l0.lake_cell_u100" + 0, 4, "t.l0.lake_cell_u010" + 0, 6, "t.l0.lake_cell_u110" + 0, 8, "t.l0.lake_cell_u001" + 0, 10, "t.l0.lake_cell_u101" + 0, 12, "t.l0.lake_cell_u011" + 0, 14, "t.l0.lake_cell_u111" + + 1, 0, "t.l0.lake_cell_d000" + 1, 2, "t.l0.lake_cell_d100" + 1, 4, "t.l0.lake_cell_d010" + 1, 6, "t.l0.lake_cell_d110" + 1, 8, "t.l0.lake_cell_d001" + 1, 10, "t.l0.lake_cell_d101" + 1, 12, "t.l0.lake_cell_d011" + 1, 14, "t.l0.lake_cell_d111" + + 2, 0, "t.l0.lake_cell_l000" + 2, 2, "t.l0.lake_cell_l100" + 2, 4, "t.l0.lake_cell_l010" + 2, 6, "t.l0.lake_cell_l110" + 2, 8, "t.l0.lake_cell_l001" + 2, 10, "t.l0.lake_cell_l101" + 2, 12, "t.l0.lake_cell_l011" + 2, 14, "t.l0.lake_cell_l111" + + 2, 1, "t.l0.lake_cell_r000" + 2, 3, "t.l0.lake_cell_r100" + 2, 5, "t.l0.lake_cell_r010" + 2, 7, "t.l0.lake_cell_r110" + 2, 9, "t.l0.lake_cell_r001" + 2, 11, "t.l0.lake_cell_r101" + 2, 13, "t.l0.lake_cell_r011" + 2, 15, "t.l0.lake_cell_r111" + ; coast cell sprites. See doc/README.graphics - 0, 0, "t.l0.coast_cell_u000" - 0, 2, "t.l0.coast_cell_u100" - 0, 4, "t.l0.coast_cell_u010" - 0, 6, "t.l0.coast_cell_u110" - 0, 8, "t.l0.coast_cell_u001" - 0, 10, "t.l0.coast_cell_u101" - 0, 12, "t.l0.coast_cell_u011" - 0, 14, "t.l0.coast_cell_u111" + + 3, 0, "t.l0.coast_cell_u000" + 3, 2, "t.l0.coast_cell_u100" + 3, 4, "t.l0.coast_cell_u010" + 3, 6, "t.l0.coast_cell_u110" + 3, 8, "t.l0.coast_cell_u001" + 3, 10, "t.l0.coast_cell_u101" + 3, 12, "t.l0.coast_cell_u011" + 3, 14, "t.l0.coast_cell_u111" - 1, 0, "t.l0.coast_cell_d000" - 1, 2, "t.l0.coast_cell_d100" - 1, 4, "t.l0.coast_cell_d010" - 1, 6, "t.l0.coast_cell_d110" - 1, 8, "t.l0.coast_cell_d001" - 1, 10, "t.l0.coast_cell_d101" - 1, 12, "t.l0.coast_cell_d011" - 1, 14, "t.l0.coast_cell_d111" - - 2, 0, "t.l0.coast_cell_l000" - 2, 2, "t.l0.coast_cell_l100" - 2, 4, "t.l0.coast_cell_l010" - 2, 6, "t.l0.coast_cell_l110" - 2, 8, "t.l0.coast_cell_l001" - 2, 10, "t.l0.coast_cell_l101" - 2, 12, "t.l0.coast_cell_l011" - 2, 14, "t.l0.coast_cell_l111" - - 2, 1, "t.l0.coast_cell_r000" - 2, 3, "t.l0.coast_cell_r100" - 2, 5, "t.l0.coast_cell_r010" - 2, 7, "t.l0.coast_cell_r110" - 2, 9, "t.l0.coast_cell_r001" - 2, 11, "t.l0.coast_cell_r101" - 2, 13, "t.l0.coast_cell_r011" - 2, 15, "t.l0.coast_cell_r111" - -; Deep Ocean cell sprites - 0, 16, "t.l0.floor_cell_u000" - 0, 2, "t.l0.floor_cell_u100" - 0, 4, "t.l0.floor_cell_u010" - 0, 6, "t.l0.floor_cell_u110" - 0, 8, "t.l0.floor_cell_u001" - 0, 10, "t.l0.floor_cell_u101" - 0, 12, "t.l0.floor_cell_u011" - 0, 14, "t.l0.floor_cell_u111" + 4, 0, "t.l0.coast_cell_d000" + 4, 2, "t.l0.coast_cell_d100" + 4, 4, "t.l0.coast_cell_d010" + 4, 6, "t.l0.coast_cell_d110" + 4, 8, "t.l0.coast_cell_d001" + 4, 10, "t.l0.coast_cell_d101" + 4, 12, "t.l0.coast_cell_d011" + 4, 14, "t.l0.coast_cell_d111" + + 5, 0, "t.l0.coast_cell_l000" + 5, 2, "t.l0.coast_cell_l100" + 5, 4, "t.l0.coast_cell_l010" + 5, 6, "t.l0.coast_cell_l110" + 5, 8, "t.l0.coast_cell_l001" + 5, 10, "t.l0.coast_cell_l101" + 5, 12, "t.l0.coast_cell_l011" + 5, 14, "t.l0.coast_cell_l111" + + 5, 1, "t.l0.coast_cell_r000" + 5, 3, "t.l0.coast_cell_r100" + 5, 5, "t.l0.coast_cell_r010" + 5, 7, "t.l0.coast_cell_r110" + 5, 9, "t.l0.coast_cell_r001" + 5, 11, "t.l0.coast_cell_r101" + 5, 13, "t.l0.coast_cell_r011" + 5, 15, "t.l0.coast_cell_r111" + +; floor cell sprites. See doc/README.graphics + + 6, 0, "t.l0.floor_cell_u000" + 6, 2, "t.l0.floor_cell_u100" + 6, 4, "t.l0.floor_cell_u010" + 6, 6, "t.l0.floor_cell_u110" + 6, 8, "t.l0.floor_cell_u001" + 6, 10, "t.l0.floor_cell_u101" + 6, 12, "t.l0.floor_cell_u011" + 6, 14, "t.l0.floor_cell_u111" - 1, 16, "t.l0.floor_cell_d000" - 1, 2, "t.l0.floor_cell_d100" - 1, 4, "t.l0.floor_cell_d010" - 1, 6, "t.l0.floor_cell_d110" - 1, 8, "t.l0.floor_cell_d001" - 1, 10, "t.l0.floor_cell_d101" - 1, 12, "t.l0.floor_cell_d011" - 1, 14, "t.l0.floor_cell_d111" - - 2, 16, "t.l0.floor_cell_l000" - 2, 2, "t.l0.floor_cell_l100" - 2, 4, "t.l0.floor_cell_l010" - 2, 6, "t.l0.floor_cell_l110" - 2, 8, "t.l0.floor_cell_l001" - 2, 10, "t.l0.floor_cell_l101" - 2, 12, "t.l0.floor_cell_l011" - 2, 14, "t.l0.floor_cell_l111" - - 2, 17, "t.l0.floor_cell_r000" - 2, 3, "t.l0.floor_cell_r100" - 2, 5, "t.l0.floor_cell_r010" - 2, 7, "t.l0.floor_cell_r110" - 2, 9, "t.l0.floor_cell_r001" - 2, 11, "t.l0.floor_cell_r101" - 2, 13, "t.l0.floor_cell_r011" - 2, 15, "t.l0.floor_cell_r111" + 7, 0, "t.l0.floor_cell_d000" + 7, 2, "t.l0.floor_cell_d100" + 7, 4, "t.l0.floor_cell_d010" + 7, 6, "t.l0.floor_cell_d110" + 7, 8, "t.l0.floor_cell_d001" + 7, 10, "t.l0.floor_cell_d101" + 7, 12, "t.l0.floor_cell_d011" + 7, 14, "t.l0.floor_cell_d111" + + 8, 0, "t.l0.floor_cell_l000" + 8, 2, "t.l0.floor_cell_l100" + 8, 4, "t.l0.floor_cell_l010" + 8, 6, "t.l0.floor_cell_l110" + 8, 8, "t.l0.floor_cell_l001" + 8, 10, "t.l0.floor_cell_l101" + 8, 12, "t.l0.floor_cell_l011" + 8, 14, "t.l0.floor_cell_l111" + + 8, 1, "t.l0.floor_cell_r000" + 8, 3, "t.l0.floor_cell_r100" + 8, 5, "t.l0.floor_cell_r010" + 8, 7, "t.l0.floor_cell_r110" + 8, 9, "t.l0.floor_cell_r001" + 8, 11, "t.l0.floor_cell_r101" + 8, 13, "t.l0.floor_cell_r011" + 8, 15, "t.l0.floor_cell_r111" } diff -Nru freeciv-2.5.7/data/isophex.tilespec freeciv-2.5.8/data/isophex.tilespec --- freeciv-2.5.7/data/isophex.tilespec 2017-05-13 11:55:06.000000000 +0000 +++ freeciv-2.5.8/data/isophex.tilespec 2017-08-12 11:47:32.000000000 +0000 @@ -101,6 +101,14 @@ ; Water graphics referenced by terrain.ruleset ; +[tile_lake] +blend_layer = 1 +num_layers = 1 +layer0_match_type = "water" +layer0_match_with = "water" +layer0_sprite_type = "corner" +mine_sprite = "tx.oil_mine" + [tile_coast] blend_layer = 1 num_layers = 1 @@ -110,7 +118,7 @@ mine_sprite = "tx.oil_mine" [tile_floor] -blend_layer = 0 +blend_layer = 1 num_layers = 1 layer0_match_type = "water" layer0_match_with = "water" diff -Nru freeciv-2.5.7/data/Makefile.in freeciv-2.5.8/data/Makefile.in --- freeciv-2.5.7/data/Makefile.in 2017-05-13 12:00:04.000000000 +0000 +++ freeciv-2.5.8/data/Makefile.in 2017-08-12 11:50:29.000000000 +0000 @@ -976,8 +976,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GGZ_CLIENT_FALSE@install-data-local: @GGZ_CLIENT_FALSE@uninstall-local: +@GGZ_CLIENT_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am diff -Nru freeciv-2.5.7/data/multiplayer/cities.ruleset freeciv-2.5.8/data/multiplayer/cities.ruleset --- freeciv-2.5.7/data/multiplayer/cities.ruleset 2017-05-13 11:55:09.000000000 +0000 +++ freeciv-2.5.8/data/multiplayer/cities.ruleset 2017-08-12 11:47:32.000000000 +0000 @@ -116,6 +116,7 @@ ; is omitted, same graphics as for land cities is used ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles +; FIXME: this and _alt not currently used! ; reqs = requirements for this city style (see README.effects) ; replaced_by = which style replaced this one ; diff -Nru freeciv-2.5.7/data/multiplayer/units.ruleset freeciv-2.5.8/data/multiplayer/units.ruleset --- freeciv-2.5.7/data/multiplayer/units.ruleset 2017-05-13 11:55:09.000000000 +0000 +++ freeciv-2.5.8/data/multiplayer/units.ruleset 2017-08-12 11:47:32.000000000 +0000 @@ -2360,6 +2360,8 @@ roles = "GameLoss" helptext = _("\ This is you. If you lose this unit, you lose the game. So don't.\ +"), _("\ +Won't unleash barbarians from huts.\ ") [unit_barbarian_leader] diff -Nru freeciv-2.5.7/data/nation/american.ruleset freeciv-2.5.8/data/nation/american.ruleset --- freeciv-2.5.7/data/nation/american.ruleset 2017-05-13 11:55:17.000000000 +0000 +++ freeciv-2.5.8/data/nation/american.ruleset 2017-08-12 11:47:32.000000000 +0000 @@ -27,7 +27,7 @@ "James Polk", "Male" "Zachary Taylor", "Male" "Abraham Lincoln", "Male" - "Andew Johnson", "Male" + "Andrew Johnson", "Male" "Ulysses S. Grant", "Male" "Grover Cleveland", "Male" "William McKinley", "Male" diff -Nru freeciv-2.5.7/data/themes/gui-sdl/human/theme.themespec freeciv-2.5.8/data/themes/gui-sdl/human/theme.themespec --- freeciv-2.5.7/data/themes/gui-sdl/human/theme.themespec 2017-05-13 11:55:04.000000000 +0000 +++ freeciv-2.5.8/data/themes/gui-sdl/human/theme.themespec 2017-08-12 11:47:32.000000000 +0000 @@ -10,8 +10,8 @@ ; The font to be used: font_file = "themes/gui-sdl/human/DejaVuSans.ttf" ; To use CJK fonts, provide the path to the font below. -; Fonts recommended for Freeciv can be fetched from svn trunk, e.g.: -; http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-sdl/human/ +; Fonts recommended for Freeciv can be fetched from git master, e.g.: +; https://raw.githubusercontent.com/freeciv/freeciv/master/data/themes/gui-sdl/human/fireflysung.ttf font_file_zh_CN = "themes/gui-sdl/human/fireflysung.ttf" font_file_ja = "themes/gui-sdl/human/sazanami-gothic.ttf" font_file_ko = "themes/gui-sdl/human/UnDotum.ttf" diff -Nru freeciv-2.5.7/debian/changelog freeciv-2.5.8/debian/changelog --- freeciv-2.5.7/debian/changelog 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/changelog 2017-08-17 15:51:09.000000000 +0000 @@ -1,3 +1,12 @@ +freeciv (2.5.8-1) unstable; urgency=medium + + * New upstream version 2.5.8. + * Declare compliance with Debian Policy 4.0.1. + * Refresh themes_sdl_use_system_fonts.patch. + * Install appdata files into metainfo directory. + + -- Markus Koschany Thu, 17 Aug 2017 17:51:09 +0200 + freeciv (2.5.7-2) unstable; urgency=medium * Upload to unstable. diff -Nru freeciv-2.5.7/debian/control freeciv-2.5.8/debian/control --- freeciv-2.5.7/debian/control 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/control 2017-08-17 15:51:09.000000000 +0000 @@ -7,7 +7,7 @@ Clint Adams , Karl Goetz , Markus Koschany -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Homepage: http://www.freeciv.org/ Vcs-Git: https://anonscm.debian.org/git/pkg-games/freeciv.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/freeciv.git diff -Nru freeciv-2.5.7/debian/freeciv-client-extras.install freeciv-2.5.8/debian/freeciv-client-extras.install --- freeciv-2.5.7/debian/freeciv-client-extras.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-client-extras.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,5 +1,5 @@ usr/games/freeciv-mp-gtk3 -usr/share/appdata/freeciv-mp-gtk3.appdata.xml +usr/share/appdata/freeciv-mp-gtk3.appdata.xml usr/share/metainfo/ usr/share/applications/freeciv-mp-gtk3.desktop usr/share/man/man6/freeciv-modpack.6 usr/share/man/man6/freeciv-mp-gtk3.6 diff -Nru freeciv-2.5.7/debian/freeciv-client-gtk3.install freeciv-2.5.8/debian/freeciv-client-gtk3.install --- freeciv-2.5.7/debian/freeciv-client-gtk3.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-client-gtk3.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/games/freeciv-gtk3 -usr/share/appdata/freeciv-gtk3.appdata.xml +usr/share/appdata/freeciv-gtk3.appdata.xml usr/share/metainfo/freeciv-gtk3.appdata.xml usr/share/applications/freeciv.desktop diff -Nru freeciv-2.5.7/debian/freeciv-client-gtk.install freeciv-2.5.8/debian/freeciv-client-gtk.install --- freeciv-2.5.7/debian/freeciv-client-gtk.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-client-gtk.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/games/freeciv-gtk2 -usr/share/appdata/freeciv-gtk2.appdata.xml +usr/share/appdata/freeciv-gtk2.appdata.xml usr/share/metainfo/ usr/share/applications/freeciv-gtk2.desktop diff -Nru freeciv-2.5.7/debian/freeciv-client-qt.install freeciv-2.5.8/debian/freeciv-client-qt.install --- freeciv-2.5.7/debian/freeciv-client-qt.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-client-qt.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/games/freeciv-qt -usr/share/appdata/freeciv-qt.appdata.xml +usr/share/appdata/freeciv-qt.appdata.xml usr/share/metainfo/ usr/share/applications/freeciv-qt.desktop diff -Nru freeciv-2.5.7/debian/freeciv-client-sdl.install freeciv-2.5.8/debian/freeciv-client-sdl.install --- freeciv-2.5.7/debian/freeciv-client-sdl.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-client-sdl.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/games/freeciv-sdl -usr/share/appdata/freeciv-sdl.appdata.xml +usr/share/appdata/freeciv-sdl.appdata.xml usr/share/metainfo/ usr/share/applications/freeciv-sdl.desktop diff -Nru freeciv-2.5.7/debian/freeciv-server.install freeciv-2.5.8/debian/freeciv-server.install --- freeciv-2.5.7/debian/freeciv-server.install 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/freeciv-server.install 2017-08-17 15:51:09.000000000 +0000 @@ -1,5 +1,5 @@ etc/freeciv/database.lua usr/games/freeciv-server -usr/share/appdata/freeciv-server.appdata.xml +usr/share/appdata/freeciv-server.appdata.xml usr/share/metainfo/ usr/share/applications/freeciv-server.desktop usr/share/man/man6/freeciv-server.6 diff -Nru freeciv-2.5.7/debian/patches/themes_sdl_use_system_fonts.patch freeciv-2.5.8/debian/patches/themes_sdl_use_system_fonts.patch --- freeciv-2.5.7/debian/patches/themes_sdl_use_system_fonts.patch 2017-06-23 13:49:39.000000000 +0000 +++ freeciv-2.5.8/debian/patches/themes_sdl_use_system_fonts.patch 2017-08-17 15:51:09.000000000 +0000 @@ -1,16 +1,13 @@ -From: Debian Games Team -Date: Sun, 19 Oct 2014 22:30:23 +0200 +From: Markus Koschany +Date: Thu, 17 Aug 2017 02:29:31 +0200 Subject: themes_sdl_use_system_fonts -Use Debian's system fonts. - -Forwarded: not-needed --- data/themes/gui-sdl/human/theme.themespec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/themes/gui-sdl/human/theme.themespec b/data/themes/gui-sdl/human/theme.themespec -index 9129192..0a0da06 100644 +index a03f5ee..34f05cd 100644 --- a/data/themes/gui-sdl/human/theme.themespec +++ b/data/themes/gui-sdl/human/theme.themespec @@ -8,13 +8,13 @@ name = "human" @@ -20,8 +17,8 @@ -font_file = "themes/gui-sdl/human/DejaVuSans.ttf" +font_file = "../../fonts/truetype/dejavu/DejaVuSans.ttf" ; To use CJK fonts, provide the path to the font below. - ; Fonts recommended for Freeciv can be fetched from svn trunk, e.g.: - ; http://svn.gna.org/viewcvs/freeciv/trunk/data/themes/gui-sdl/human/ + ; Fonts recommended for Freeciv can be fetched from git master, e.g.: + ; https://raw.githubusercontent.com/freeciv/freeciv/master/data/themes/gui-sdl/human/fireflysung.ttf -font_file_zh_CN = "themes/gui-sdl/human/fireflysung.ttf" -font_file_ja = "themes/gui-sdl/human/sazanami-gothic.ttf" -font_file_ko = "themes/gui-sdl/human/UnDotum.ttf" diff -Nru freeciv-2.5.7/dependencies/tolua-5.2/src/bin/Makefile.am freeciv-2.5.8/dependencies/tolua-5.2/src/bin/Makefile.am --- freeciv-2.5.7/dependencies/tolua-5.2/src/bin/Makefile.am 2017-05-13 11:58:56.000000000 +0000 +++ freeciv-2.5.8/dependencies/tolua-5.2/src/bin/Makefile.am 2017-08-12 11:47:32.000000000 +0000 @@ -37,3 +37,6 @@ tolua_LDADD = \ $(LUA_LIBS) \ ../lib/libtolua.la + +EXTRA_DIST = \ + tolua.pkg diff -Nru freeciv-2.5.7/dependencies/tolua-5.2/src/bin/Makefile.in freeciv-2.5.8/dependencies/tolua-5.2/src/bin/Makefile.in --- freeciv-2.5.7/dependencies/tolua-5.2/src/bin/Makefile.in 2017-05-13 12:00:09.000000000 +0000 +++ freeciv-2.5.8/dependencies/tolua-5.2/src/bin/Makefile.in 2017-08-12 11:50:34.000000000 +0000 @@ -581,6 +581,9 @@ $(LUA_LIBS) \ ../lib/libtolua.la +EXTRA_DIST = \ + tolua.pkg + all: all-am .SUFFIXES: diff -Nru freeciv-2.5.7/dependencies/tolua-5.2/src/bin/tolua.pkg freeciv-2.5.8/dependencies/tolua-5.2/src/bin/tolua.pkg --- freeciv-2.5.7/dependencies/tolua-5.2/src/bin/tolua.pkg 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.5.8/dependencies/tolua-5.2/src/bin/tolua.pkg 2017-08-12 11:47:32.000000000 +0000 @@ -0,0 +1,28 @@ +$lfile "lua/compat.lua" +$lfile "lua/basic.lua" +$lfile "lua/feature.lua" +$lfile "lua/verbatim.lua" +$lfile "lua/code.lua" +$lfile "lua/typedef.lua" +$lfile "lua/container.lua" +$lfile "lua/package.lua" +$lfile "lua/module.lua" +$lfile "lua/namespace.lua" +$lfile "lua/define.lua" +$lfile "lua/enumerate.lua" +$lfile "lua/declaration.lua" +$lfile "lua/variable.lua" +$lfile "lua/array.lua" +$lfile "lua/function.lua" +$lfile "lua/operator.lua" +$lfile "lua/class.lua" +$lfile "lua/clean.lua" +$lfile "lua/doit.lua" + +$[ +local err,msg = pcall(doit) +if not err then + local _,_,label,msg = strfind(msg,"(.-:.-:%s*)(.*)") + tolua_error(msg,label) +end +$] diff -Nru freeciv-2.5.7/diff_ignore freeciv-2.5.8/diff_ignore --- freeciv-2.5.7/diff_ignore 2017-05-13 11:57:57.000000000 +0000 +++ freeciv-2.5.8/diff_ignore 2017-08-12 11:47:32.000000000 +0000 @@ -19,7 +19,7 @@ .#* .deps .libs -.svn +.git Freeciv.h Makefile Makefile.in diff -Nru freeciv-2.5.7/doc/CodingStyle freeciv-2.5.8/doc/CodingStyle --- freeciv-2.5.7/doc/CodingStyle 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/CodingStyle 2017-08-12 11:47:32.000000000 +0000 @@ -583,7 +583,7 @@ - To assign null pointer, or to compare against one, use 'NULL' in C code, and 'nullptr' in C++ code. -- If you send patches, use "diff -u" (or "diff -r -u"). "svn diff" works +- If you send patches, use "diff -u" (or "diff -r -u"). "git diff" works correctly without extra parameters. For further information, see: @@ -595,7 +595,7 @@ - When doing a "diff" for a patch, be sure to exclude unnecessary files by using the "-X" argument to "diff". E.g.: - % diff -ruN -Xdiff_ignore freeciv_svn freeciv >/tmp/fix-foo-bug-0.patch + % diff -ruN -Xdiff_ignore freeciv_git freeciv >/tmp/fix-foo-bug-0.patch A suggested "diff_ignore" file is included in the Freeciv distribution. diff -Nru freeciv-2.5.7/doc/FAQ freeciv-2.5.8/doc/FAQ --- freeciv-2.5.7/doc/FAQ 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/FAQ 2017-08-12 11:47:32.000000000 +0000 @@ -133,10 +133,8 @@ commands. Detailed explanations of how to play Freeciv are also in the - ./doc/README file distributed with the source code, and in the online - manual available on this site. The manual covers both the client and - the server and is available in several different versions for various - major Freeciv releases. + ./doc/README file distributed with the source code, and in the in-game + help. ------- @@ -200,9 +198,9 @@ You have to declare war first. See section for How do I declare war on another player below. - (As a note, you start out at war with all players, but you are always - offered a cease-fire treaty upon first contact which if accepted has to - be broken before you can attack the player's units or cities.) + (As a note, you start out at war with all players, but AI players offer + you a cease-fire treaty upon first contact which if accepted has to be + broken before you can attack the player's units or cities.) ------- @@ -259,9 +257,9 @@ If you want to avoid the game ending by space race, you can change the spacerace setting - again either through the Server Options dialog or through the chatline by: -/set spacerace 0 +/set spacerace disabled - From 2.4, you can allow space races without them ending the game by + You can instead allow space races without them ending the game by instead changing the endspaceship setting. A single player who defeats all enemies will always win the game -- @@ -353,11 +351,11 @@ options). After the game begins you may still change some settings (but not others). - World maps can be created using the built-in map editor. It is also - possible to edit running games: Just enable Editing Mode from the Edit - menu. (You may also unzip and edit any savegame with a text editor, if - you're ambitious, although the format is not documented and is subject - to change.) + World maps can be created using the built-in map editor in the GTK + clients. It is also possible to edit running games: Just enable Editing + Mode from the Edit menu. (You may also unzip and edit any savegame with + a text editor, if you're ambitious, although the format is not + documented and is subject to change.) You can create rulesets or "modpacks" - alternative sets of units, buildings, and technologies. Several different rulesets come with the @@ -379,15 +377,14 @@ Freeciv was created as a multiplayer version of Civilization™ with players moving simultaneously. Rules and elements of Civilization II, and features required for single-player use, such as AI players, were - added later. It is still a stated goal to let Freeciv's game engine be - 100% compatible with Civilization™ I and II, but only as an option. + added later. This is why Freeciv comes with three game configurations (rulesets): the civ1 and civ2 rulesets implement game rules, elements and features that bring it as close as possible to Civilization I and Civilization - II respectively, while the default ruleset tries to reflect the most - popular settings among Freeciv players. Unimplemented Civilization I - and II features are mainly those that would have little or no benefit + II respectively, while the default classic ruleset tries to reflect the + most popular settings among Freeciv players. Unimplemented Civilization + I and II features are mainly those that would have little or no benefit in multiplayer mode, and nobody is working on closing this gap. Little or no work is being done on implementing features from other @@ -396,7 +393,9 @@ So the goal of compatibility is mainly used as a limiting factor in development: when a new feature is added to Freeciv that makes gameplay different, it is generally implemented in such a way that the - "traditional" behaviour remains available as an option. + "traditional" behaviour remains available as an option. However, we're + not aiming for absolute 100% compatibility; in particular, we're not + aiming for bug-compatibility. See also Projects. @@ -700,26 +699,24 @@ 3.5 Am I using the latest version? Do I need to upgrade? - The current stable Freeciv version is 2.5.7. For an overview of changes - that went into this release, see the NEWS-2.5.7 article. + The current stable Freeciv version is 2.5.8. For an overview of changes + that went into this release, see the NEWS-2.5.8 article. The NEWS-#.#.# article is only updated for a new release; updates to - Subversion are listed in the freeciv-commits archives (see Mailing - Lists) and the actual code changes can be reviewed using our online - source code browser. + Git can be reviewed in the online source code browser. If you decide to upgrade, see the Download page for source code or contributed binaries. It's unlikely that all precompiled binaries and ports have been updated - to 2.5.7 yet. If you can contribute, please do! Prepare a package and + to 2.5.8 yet. If you can contribute, please do! Prepare a package and announce it to freeciv-dev@freelists.org. Clients and servers of different major versions are generally incompatible due to changes in the client/server protocol. You will see incompatibilities as a 'mismatched capabilities' error. Different minor versions should be compatible, however. For example, 2.0.0 and 2.0.8 - are compatible; 2.0.0 and 2.5.7 are not. + are compatible; 2.0.0 and 2.5.8 are not. ------- @@ -1103,18 +1100,18 @@ 3.27 How do I get the latest development code? - Use Subversion (SVN) directly: - 1. Obtain and install SVN on your Unix machine. On modern - distributions it is already there; look for the svn command. You - can get SVN from Apache.org. + Use Git directly: + 1. Obtain and install Git on your Unix machine. On modern + distributions it is already there; look for the git command. You + can get Git from git-scm.com. 2. Grab the source: - $ svn co svn://svn.gna.org/svn/freeciv/trunk freeciv + $ git clone https://github.com/freeciv/freeciv Once you're retrieved the source, to update it, cd into the freeciv - directory and issue svn update. + directory and issue git pull. - Another useful svn command is svn diff. + Another useful git command is git diff. This shows the changes between the version you have on disk and the current development code. @@ -1124,8 +1121,6 @@ See also How to Contribute to Freeciv development. - If you'd like to know more about SVN, try here. - ------- 3.28 How do I disable full screen mode? @@ -1209,10 +1204,10 @@ The Native Windows packages come as self-extracting installers. - Simply download and install one of the .EXE installers. There are two - different packages available, one using the GTK+ 2.0 toolkit, and one - using the SDL libraries. The GTK version requires Windows NT, 2000, XP - or later. + Simply download and install one of the .EXE installers. There are + three different packages available: one using the GTK+ 2.0 toolkit, + one using Qt, and one using the SDL libraries. The GTK version requires + Windows NT, 2000, XP or later. ------- @@ -1220,8 +1215,8 @@ If you used one of the self installer versions then there's a program group with the name chosen at installation time (for example, - Freeciv 2.5.7 (GTK+2 client).) Just go to click on - Start→Programs→Freeciv 2.5.7 (GTK+2 client)→Freeciv + Freeciv 2.5.8 (GTK+2 client).) Just go to click on + Start→Programs→Freeciv 2.5.8 (GTK+2 client)→Freeciv That's it! You should be up and running. @@ -1264,8 +1259,8 @@ Then you have to unpack the tileset into the DATA or root directory in your Freeciv directory (so if your Freeciv directory is - C:\FREECIV-2.5.7, then you'd tell 7-Zip to extract to - C:\FREECIV-2.5.7\DATA.) Make sure you tell your extraction program to + C:\FREECIV-2.5.8, then you'd tell 7-Zip to extract to + C:\FREECIV-2.5.8\DATA.) Make sure you tell your extraction program to extract into the subdirectories in the file. Once that's done you can start using the new tileset (FINALLY!) @@ -1278,7 +1273,7 @@ the Freeciv client when you start it. Open a Command Prompt (from Start→Programs→Accessories→Command Prompt in my case, sometimes called an MS-DOS Window). Change to the Freeciv directory (for example, cd - \FREECIV-2.5.7) and start the client with the --tiles tilesetname + \FREECIV-2.5.8) and start the client with the --tiles tilesetname option. For example for the gtk2 client, FREECIV-GTK2 --tiles freeland @@ -1293,7 +1288,7 @@ Otherwise, a different ruleset can be used by downloading the ruleset and extracting it in the Freeciv root or data directory - (C:\FREECIV-2.5.7\DATA, for example). This should create a subdirectory + (C:\FREECIV-2.5.8\DATA, for example). This should create a subdirectory with the ruleset name (ancients, for example.) Then you need to tell the server to use it. This is done by typing @@ -1313,6 +1308,10 @@ 5 Mac OS X + Beware: none of the current development team use the Mac OS. We're not + currently building packages, and don't have recent experience. This + section is probably out of date. + ------- 5.1 How do I install the latest version of Freeciv or compile it myself? @@ -1411,4 +1410,3 @@ * Official releases later than 2.0.3 are built to run on OS X Tiger or later and won't start on earlier versions of OS X. - diff -Nru freeciv-2.5.7/doc/HACKING freeciv-2.5.8/doc/HACKING --- freeciv-2.5.7/doc/HACKING 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/HACKING 2017-08-12 11:47:32.000000000 +0000 @@ -61,7 +61,7 @@ Server Autogame Testing =========================================================================== Code changes should always be tested before submission for inclusion -into the svn source tree. It is useful to run the client and server as +into the git source tree. It is useful to run the client and server as autogames to verify either a particular savegame no longer shows a fixed bug, or as a random sequence of games in a while loop overnight. @@ -1175,7 +1175,7 @@ - When doing a "diff" for a patch, be sure to exclude unnecessary files by using the "-X" argument to "diff". E.g.: - % diff -ruN -Xdiff_ignore freeciv_svn freeciv >/tmp/fix-foo-bug-0.patch + % diff -ruN -Xdiff_ignore freeciv_git freeciv >/tmp/fix-foo-bug-0.patch A suggested "diff_ignore" file is included in the Freeciv distribution. diff -Nru freeciv-2.5.7/doc/INSTALL.Cygwin freeciv-2.5.8/doc/INSTALL.Cygwin --- freeciv-2.5.7/doc/INSTALL.Cygwin 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/INSTALL.Cygwin 2017-08-12 11:47:32.000000000 +0000 @@ -39,7 +39,7 @@ To get and build freeciv development version directly from version control, you need also - - subversion (Development) + - git (Development) - automake1.14 (Development) - libtool (Development) diff -Nru freeciv-2.5.7/doc/Makefile.am freeciv-2.5.8/doc/Makefile.am --- freeciv-2.5.7/doc/Makefile.am 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/Makefile.am 2017-08-12 11:47:32.000000000 +0000 @@ -24,6 +24,7 @@ README.ruleset_multiplayer \ README.ruleset_civ2civ3 \ README.rulesets \ + README.tilesets \ README.scorelog \ README.SDLClient \ README.sound \ diff -Nru freeciv-2.5.7/doc/Makefile.in freeciv-2.5.8/doc/Makefile.in --- freeciv-2.5.7/doc/Makefile.in 2017-05-13 12:00:09.000000000 +0000 +++ freeciv-2.5.8/doc/Makefile.in 2017-08-12 11:50:34.000000000 +0000 @@ -604,6 +604,7 @@ README.ruleset_multiplayer \ README.ruleset_civ2civ3 \ README.rulesets \ + README.tilesets \ README.scorelog \ README.SDLClient \ README.sound \ diff -Nru freeciv-2.5.7/doc/README freeciv-2.5.8/doc/README --- freeciv-2.5.7/doc/README 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/README 2017-08-12 11:47:32.000000000 +0000 @@ -62,7 +62,7 @@ (manually) derived graphics are also included in the distribution. These materials are available in the separate 'graphics-materials' distribution (e.g., freeciv-2.4.0-graphics-materials.tar.bz2), or from -version control (Subversion). +version control (Git). Compiling and installing: diff -Nru freeciv-2.5.7/doc/README.fcdb freeciv-2.5.8/doc/README.fcdb --- freeciv-2.5.7/doc/README.fcdb 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/README.fcdb 2017-08-12 11:47:32.000000000 +0000 @@ -225,10 +225,11 @@ ================================ * Move password comparison / policy to Lua script - -* Give database.lua access to do more stuff -* Allow setting cmdlevel per-user, etc + +* Give database.lua access to do more stuff + +* Allow setting cmdlevel per-user, etc + * Give database.lua access to game signals and events - -* Lua script for postgres + * Improve this README diff -Nru freeciv-2.5.7/doc/README.ruleset_civ2civ3 freeciv-2.5.8/doc/README.ruleset_civ2civ3 --- freeciv-2.5.7/doc/README.ruleset_civ2civ3 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/doc/README.ruleset_civ2civ3 2017-08-12 11:47:32.000000000 +0000 @@ -101,7 +101,7 @@ random technology is lost, and half of its value is restored to the count of Bulbs. -- Enabled risk of Plague at cities with pop greater than 4. Chances +- Enabled risk of Plague at cities with population greater than 4. Chances reduced by the buildings Aqueduct and Sewer System, the tech Medicine, and the wonder Cure for Cancer. @@ -128,10 +128,6 @@ - Set Occupy Chance to 100%: Units automatically move to the target tile if the attack is successful and ZoC rules allow the movement. -- Disabled Happy Borders: Military Units cause unhappiness if they end - the turn outside cities or fortresses, no matter if they are inside - national borders. - FOODBOX: -------- @@ -798,11 +794,11 @@ periods when government changes. - (#)"United Nations" 600: +10 to AI love for the owner. Revolution_When_Unhappy and Has_Senate - for Every Nation. + for every nation. - "Great Wall" 300, Obsolete by Machine Tools (Artillery): +50% Defense bonus against Land units in every city, and cities do not - lose Population due to attacks. + lose population due to attacks. - "Leonardo's Workshop" 400, Obsolete by Combustion: Upgrades one obsolete unit per game turn. - "Hoover Dam" 600, Requires Factory: @@ -832,9 +828,6 @@ - Large cities (Pop>=8) no longer get extra units free of upkeep or military unhappiness. The result is 1, 2, or 3 free units per city, depending on the government. -- Disabled happyborders: Units cause military unhappiness if they end - the turn outside cities or fortresses, no matter if they are inside - national borders. - Readjusted effect of some wonders: Mausoleum of Mausolos, Statue of Liberty, and those related to military unhappiness. Marco Polo's Embassy obsolete by Democracy. diff -Nru freeciv-2.5.7/doc/README.tilesets freeciv-2.5.8/doc/README.tilesets --- freeciv-2.5.7/doc/README.tilesets 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.5.8/doc/README.tilesets 2017-08-12 11:47:32.000000000 +0000 @@ -0,0 +1,30 @@ +---------------------------------------------------------------------- + Freeciv Tilesets +---------------------------------------------------------------------- + +Quickstart: +----------- + +Tilesets are a collection of images which are needed to display the +map. + +---------------------------------------------------------------------- +Update information: +------------------- + +The information about the changes in the definition of a tileset between +different versions of Freeciv is kept in the wiki at http://www.freeciv.org/ +The URLs below list the differences between the freeciv versions from 1.14.x +to the current version: + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.4_to_2.5 + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.3_to_2.4 + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.2_to_2.3 + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.1_to_2.2 + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.0_to_2.1 + +http://www.freeciv.org/wiki/How_to_update_a_tileset_from_1.14_to_2.0 diff -Nru freeciv-2.5.7/fc_config.h.in freeciv-2.5.8/fc_config.h.in --- freeciv-2.5.7/fc_config.h.in 2017-05-13 12:00:35.000000000 +0000 +++ freeciv-2.5.8/fc_config.h.in 2017-08-12 11:51:00.000000000 +0000 @@ -552,9 +552,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Get svn revision information to version number */ -#undef SVNREV - /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME diff -Nru freeciv-2.5.7/fc_version freeciv-2.5.8/fc_version --- freeciv-2.5.7/fc_version 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/fc_version 2017-08-12 11:47:32.000000000 +0000 @@ -6,7 +6,7 @@ MAJOR_VERSION="2" MINOR_VERSION="5" -PATCH_VERSION="7" +PATCH_VERSION="8" VERSION_LABEL="" # 1) Development until MAJOR and MINOR version numbers are @@ -63,9 +63,7 @@ VERSION_LABEL=$(echo $FREECIV_LABEL_FORCE | sed "s//$VERSION_LABEL/g") fi -if test x$VERSION_REVTYPE = xsvn && which svn > /dev/null ; then - VERSION_REV="r$(LANG=C svn info 2>/dev/null | grep "^Revision: " | sed 's/^Revision: //')" -elif test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then +if test x$VERSION_REVTYPE = xgit && which git > /dev/null ; then VERSION_REV="$(git rev-parse --short HEAD)" else VERSION_REV="" diff -Nru freeciv-2.5.7/INSTALL freeciv-2.5.8/INSTALL --- freeciv-2.5.7/INSTALL 2017-05-13 11:54:09.000000000 +0000 +++ freeciv-2.5.8/INSTALL 2017-08-12 11:47:30.000000000 +0000 @@ -18,7 +18,7 @@ 1d. Prerequisites for the Xaw client: 1e. Prerequisites for the Qt client: 2. Generating Makefiles - 2a. Generating the Makefile for svn versions: + 2a. Generating the Makefile for git versions: 2b. Generating the Makefile for release versions: 3. Compiling Freeciv: 4. Installation: @@ -80,13 +80,13 @@ http://curl.haxx.se/ -The svn version has additional requirements. A release version +The git version has additional requirements. A release version contains the generated files. - The programs from GNU gettext version 0.10.36 or better Especial the xgettext program is required to create the *.gmo - files which aren't included in the svn tree. + files which aren't included in the git tree. - GNU autoconf version 2.61 or better @@ -376,13 +376,13 @@ 2. Generating Makefiles ======================= -This section contains two parts, one for generating makefiles from svn +This section contains two parts, one for generating makefiles from git versions and one for generating makefiles from release versions. -2a. Generating the Makefile for svn versions: +2a. Generating the Makefile for git versions: ============================================= -This step is only needed for svn versions. +This step is only needed for git versions. To create the makefile just type diff -Nru freeciv-2.5.7/lua/database.lua freeciv-2.5.8/lua/database.lua --- freeciv-2.5.7/lua/database.lua 2017-05-13 11:58:56.000000000 +0000 +++ freeciv-2.5.8/lua/database.lua 2017-08-12 11:47:32.000000000 +0000 @@ -127,7 +127,7 @@ -- DIRTY: return a string to put in a database query which gets the -- current time (in seconds since the epoch, UTC). -- (This should be replaced with Lua os.time() once the script has access --- to this, see .) +-- to this, see .) function sql_time() local backend = get_option("backend") if backend == 'mysql' then diff -Nru freeciv-2.5.7/m4/ac_path_lib.m4 freeciv-2.5.8/m4/ac_path_lib.m4 --- freeciv-2.5.7/m4/ac_path_lib.m4 2017-05-13 11:58:04.000000000 +0000 +++ freeciv-2.5.8/m4/ac_path_lib.m4 2017-08-12 11:47:32.000000000 +0000 @@ -57,7 +57,7 @@ dnl Based on `AM_PATH_GTK' (gtk.m4) by Owen Taylor, and `AC_PATH_GENERIC' dnl (ac_path_generic.m4) by Angus Lees dnl -dnl @version $Id: ac_path_lib.m4 31547 2016-01-23 07:32:19Z cazfi $ +dnl @version $Id$ dnl @author Roger Leigh dnl AC_DEFUN([AC_PATH_LIB],[# check for presence of lib$1 diff -Nru freeciv-2.5.7/m4/gprof.m4 freeciv-2.5.8/m4/gprof.m4 --- freeciv-2.5.7/m4/gprof.m4 2017-05-13 11:58:04.000000000 +0000 +++ freeciv-2.5.8/m4/gprof.m4 2017-08-12 11:47:32.000000000 +0000 @@ -9,7 +9,7 @@ dnl -g is added by AC_PROG_CC if the compiler understands it if test "x$enable_gprof" = "xyes"; then - FC_C_FLAGS([-pg], [], [EXTRA_DEBUG_CFLAGS]) + FC_C_FLAGS([-pg -no-pie], [], [EXTRA_DEBUG_CFLAGS]) if test "x$cxx_works" = "xyes" ; then FC_CXX_FLAGS([-pg], [], [EXTRA_DEBUG_CXXFLAGS]) fi diff -Nru freeciv-2.5.7/m4/vsnprintf.m4 freeciv-2.5.8/m4/vsnprintf.m4 --- freeciv-2.5.7/m4/vsnprintf.m4 2017-05-13 11:58:04.000000000 +0000 +++ freeciv-2.5.8/m4/vsnprintf.m4 2017-08-12 11:47:32.000000000 +0000 @@ -6,7 +6,7 @@ dnl the buffer supplied, and having a sensible return value. It is dnl explicitly allowed not to NUL-terminate the return value, however. dnl -dnl @version $Id: vsnprintf.m4 21754 2012-08-07 11:14:18Z cazfi $ +dnl @version $Id$ dnl @author Gaute Strokkenes dnl AC_DEFUN([AC_FUNC_VSNPRINTF], diff -Nru freeciv-2.5.7/Makefile.am freeciv-2.5.8/Makefile.am --- freeciv-2.5.7/Makefile.am 2017-05-13 11:54:09.000000000 +0000 +++ freeciv-2.5.8/Makefile.am 2017-08-12 11:47:30.000000000 +0000 @@ -32,8 +32,6 @@ diff_ignore \ bootstrap/fcgui.in \ bootstrap/fcser.in \ - bootstrap/fc_svnrev_gen.h.tmpl \ - bootstrap/generate_svnrev.sh \ bootstrap/fc_gitrev_gen.h.tmpl \ bootstrap/generate_gitrev.sh \ bootstrap/freeciv.desktop.in \ diff -Nru freeciv-2.5.7/Makefile.in freeciv-2.5.8/Makefile.in --- freeciv-2.5.7/Makefile.in 2017-05-13 12:00:03.000000000 +0000 +++ freeciv-2.5.8/Makefile.in 2017-08-12 11:50:28.000000000 +0000 @@ -635,8 +635,6 @@ diff_ignore \ bootstrap/fcgui.in \ bootstrap/fcser.in \ - bootstrap/fc_svnrev_gen.h.tmpl \ - bootstrap/generate_svnrev.sh \ bootstrap/fc_gitrev_gen.h.tmpl \ bootstrap/generate_gitrev.sh \ bootstrap/freeciv.desktop.in \ diff -Nru freeciv-2.5.7/NEWS-2.5 freeciv-2.5.8/NEWS-2.5 --- freeciv-2.5.7/NEWS-2.5 2017-05-13 11:57:58.000000000 +0000 +++ freeciv-2.5.8/NEWS-2.5 2017-08-12 11:47:30.000000000 +0000 @@ -1,5 +1,5 @@ ======================== -Welcome to Freeciv 2.5.7 +Welcome to Freeciv 2.5.8 ======================== The changes in the 2.5.x series are summarised below. @@ -7,6 +7,103 @@ see the ChangeLog file. +CHANGES FROM 2.5.7 to 2.5.8 +--------------------------- + + (from ) + + 2.5.8 is a bugfix release. + +Server / General + +Changes affecting players (supplied rulesets) + + * Fix trouble loading certain compressed savegames. HRM#679197 + * Used diplomat units no longer increase the target's score. + HRM#657298 + * Fixed a warning when a player on your team goes to war with an ally + of yours. HRM#662059 + * Fixed an assertion failure when losing a tech while no tech goal is + selected. HRM#664286 + * Fixed an assertion failure when a player on your team is about to + die. HRM#662701 + * Fixed a bug that could lead to no huts when loading from a game or + scenario that was saved in the pregame state. HRM#682576 + * Fixed a typo'd leader name in the American nation. HRM#681847 + * When a city can't build a unit with a population cost, this is + explained better. GNAPATCH#7707 + +Changes affecting other rulesets / modders + + * Fix a crash when a unit has a zero activity rate. HRM#660342 + * Fix a crash when a unit has negative vision radius. HRM#661313 + * Avoids warnings and incorrect behavior when a unit's initial + veterancy turns out negative. HRM#661193 + * Prevent the scripting API from creating a stack of illegally mixed + nationality when adding a unit to a tile. HRM#661533 + * Using a script to modify the map in certain ways in response to the + 'map_generated' signal could cause an assertion failure. HRM#673767 + +General + + * Various internal changes which should only affect developers. + HRM#678452 HRM#654689 HRM#675955 HRM#679223 HRM#679917 HRM#674435 + HRM#660908 HRM#678446 + +Clients + + * Fix a possible assertion failure when a spaceship launched (or at + other times when an AI's mood changed suddenly). HRM#660363 + * (Gtk) Fix a possible Gtk warning before the map is set up. + HRM#678972 + * (Gtk) Fix a minor memory leak in the unit selection dialog. + HRM#674321 + * (Gtk3) Fix the middle-click tile info box having a transparent + background and thus being unreadable on some installations. + HRM#656549 + +Tilesets / Art + + * Updated Isophex tileset. Adds distinct Lake terrain, various other + cosmetic changes, and some extra resource types that are not used + in the supplied rulesets. HRM#680743 + +Help / Documentation + + * The civ2civ3 online help claimed Forest, Jungle, and Swamp gave a + 25% defense bonus, but in reality they only give 20% due to a game + engine limitation. The help now reflects this. (The 25% bonus will + be implemented in 2.6.) HRM#682494 + * Corrections in README.ruleset_civ2civ3. HRM#657562 + * Online help documents that Leader units entering huts won't unleash + barbarians. GNAPATCH#7545 + * doc/README.tilesets was accidentally left out of the tarball. + HRM#678449 + * Update the FAQ a bit. + * Update docs to reflect move away from gna.org. HRM#660271 + HRM#654670 HRM#664195 + * Minor update to ruleset comments. HRM#685211 + +Translations + + * Updated translations: + + Complete translations: Catalan, Russian, French, British + English. + + Incomplete translations: Finnish (100% core, 93% nations). + * Fix a help glitch for Migrants when using the Spanish translation. + HRM#662732 + +Build/portability + + * The Windows package uses a new package of libraries. This is mainly + expected to improve debugging. HRM#681643 HRM#681877 + * Work around a binutils bug that stops --enable-gprof working on + some distributions (notably, Debian Stretch -- Debian bug #854704). + HRM#675699 + * tolua.pkg, a source file not needed to build from tarballs, was + inadvertently not included in them. HRM#678447 + + CHANGES FROM 2.5.6 to 2.5.7 --------------------------- diff -Nru freeciv-2.5.7/server/citytools.c freeciv-2.5.8/server/citytools.c --- freeciv-2.5.7/server/citytools.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/citytools.c 2017-08-12 11:47:32.000000000 +0000 @@ -563,9 +563,13 @@ int do_make_unit_veteran(struct city *pcity, const struct unit_type *punittype) { - return MIN(get_unittype_bonus(city_owner(pcity), pcity->tile, punittype, - EFT_VETERAN_BUILD), - utype_veteran_levels(punittype) - 1); + int levels = get_unittype_bonus(city_owner(pcity), pcity->tile, punittype, + EFT_VETERAN_BUILD); + int max_levels = utype_veteran_levels(punittype) - 1; + + levels = CLIP(0, levels, max_levels); + + return levels; } /********************************************************************* diff -Nru freeciv-2.5.7/server/cityturn.c freeciv-2.5.8/server/cityturn.c --- freeciv-2.5.7/server/cityturn.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/cityturn.c 2017-08-12 11:47:32.000000000 +0000 @@ -1778,8 +1778,11 @@ if (city_size_get(pcity) <= pop_cost) { notify_player(pplayer, city_tile(pcity), E_CITY_CANTBUILD, ftc_server, - _("%s can't build %s yet."), - city_link(pcity), utype_name_translation(utype)); + /* TRANS: city ... utype ... size ... pop_cost */ + _("%s can't build %s yet. " + "(city size: %d, unit population cost: %d)"), + city_link(pcity), utype_name_translation(utype), + city_size_get(pcity), pop_cost); script_server_signal_emit("unit_cant_be_built", 3, API_TYPE_UNIT_TYPE, utype, API_TYPE_CITY, pcity, diff -Nru freeciv-2.5.7/server/diplomats.c freeciv-2.5.8/server/diplomats.c --- freeciv-2.5.7/server/diplomats.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/diplomats.c 2017-08-12 11:47:32.000000000 +0000 @@ -1391,8 +1391,10 @@ } } - /* FIXME: Reason should be ULR_USED for diplomats? */ - wipe_unit(pdiplomat, ULR_CAUGHT, NULL); + wipe_unit(pdiplomat, + /* A non Spy can't escape. It is therefore spent, not caught. */ + unit_has_type_flag(pdiplomat, UTYF_SPY) ? ULR_CAUGHT : ULR_USED, + NULL); } /**************************************************************************** diff -Nru freeciv-2.5.7/server/generator/mapgen.c freeciv-2.5.8/server/generator/mapgen.c --- freeciv-2.5.7/server/generator/mapgen.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/generator/mapgen.c 2017-08-12 11:47:32.000000000 +0000 @@ -1391,6 +1391,7 @@ /* don't generate tiles with mapgen==0 as we've loaded them from file */ /* also, don't delete (the handcrafted!) tiny islands in a scenario */ if (map.server.generator != MAPGEN_SCENARIO) { + map.server.have_huts = FALSE; river_types_init(); generator_init_topology(autosize); diff -Nru freeciv-2.5.7/server/maphand.c freeciv-2.5.8/server/maphand.c --- freeciv-2.5.7/server/maphand.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/maphand.c 2017-08-12 11:47:32.000000000 +0000 @@ -1382,6 +1382,10 @@ ****************************************************************************/ void update_tile_knowledge(struct tile *ptile) { + if (server_state() == S_S_INITIAL) { + return; + } + /* Players */ players_iterate(pplayer) { if (map_is_known_and_seen(ptile, pplayer, V_MAIN)) { diff -Nru freeciv-2.5.7/server/report.c freeciv-2.5.8/server/report.c --- freeciv-2.5.7/server/report.c 2017-05-13 11:54:02.000000000 +0000 +++ freeciv-2.5.8/server/report.c 2017-08-12 11:47:32.000000000 +0000 @@ -1349,7 +1349,7 @@ fprintf(score_log->fp, "\n" "# For a specification of the format of this see doc/README.scorelog or \n" - "# .\n" + "# .\n" "\n"); fprintf(score_log->fp, "id %s\n", server.game_identifier); diff -Nru freeciv-2.5.7/server/sanitycheck.c freeciv-2.5.8/server/sanitycheck.c --- freeciv-2.5.7/server/sanitycheck.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/sanitycheck.c 2017-08-12 11:47:32.000000000 +0000 @@ -479,8 +479,10 @@ SANITY_CHECK(players_on_same_team(pplayer, pplayer2)); SANITY_CHECK(player_has_real_embassy(pplayer, pplayer2)); SANITY_CHECK(player_has_real_embassy(pplayer2, pplayer)); - SANITY_CHECK(really_gives_vision(pplayer, pplayer2)); - SANITY_CHECK(really_gives_vision(pplayer2, pplayer)); + if (pplayer->is_alive && pplayer2->is_alive) { + SANITY_CHECK(really_gives_vision(pplayer, pplayer2)); + SANITY_CHECK(really_gives_vision(pplayer2, pplayer)); + } } if (pplayer->is_alive && pplayer2->is_alive diff -Nru freeciv-2.5.7/server/scripting/api_server_edit.c freeciv-2.5.8/server/scripting/api_server_edit.c --- freeciv-2.5.7/server/scripting/api_server_edit.c 2017-05-13 11:54:02.000000000 +0000 +++ freeciv-2.5.8/server/scripting/api_server_edit.c 2017-08-12 11:47:32.000000000 +0000 @@ -92,6 +92,7 @@ Unit *ptransport) { struct fc_lua *fcl; + struct city *pcity; LUASCRIPT_CHECK_STATE(L, NULL); LUASCRIPT_CHECK_ARG_NIL(L, pplayer, 2, Player, NULL); @@ -128,6 +129,19 @@ return NULL; } + if (is_non_allied_unit_tile(ptile, pplayer)) { + luascript_log(fcl, LOG_ERROR, "create_unit_full: tile is occupied by " + "enemy unit"); + return NULL; + } + + pcity = tile_city(ptile); + if (pcity != NULL && !pplayers_allied(pplayer, city_owner(pcity))) { + luascript_log(fcl, LOG_ERROR, "create_unit_full: tile is occupied by " + "enemy city"); + return NULL; + } + return create_unit_full(pplayer, ptile, ptype, veteran_level, homecity ? homecity->id : 0, moves_left, hp_left, ptransport); diff -Nru freeciv-2.5.7/server/scripting/tolua_fcdb_gen.h freeciv-2.5.8/server/scripting/tolua_fcdb_gen.h --- freeciv-2.5.7/server/scripting/tolua_fcdb_gen.h 2017-05-13 12:02:09.000000000 +0000 +++ freeciv-2.5.8/server/scripting/tolua_fcdb_gen.h 2017-08-12 11:52:29.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: fcdb -** Generated automatically by tolua 5.2.0 on Sat May 13 13:02:09 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:52:29 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/server/scripting/tolua_server_gen.c freeciv-2.5.8/server/scripting/tolua_server_gen.c --- freeciv-2.5.7/server/scripting/tolua_server_gen.c 2017-05-13 12:02:09.000000000 +0000 +++ freeciv-2.5.8/server/scripting/tolua_server_gen.c 2017-08-12 11:52:29.000000000 +0000 @@ -32,14 +32,14 @@ /* function to register type */ static void tolua_reg_types (lua_State* tolua_S) { + tolua_usertype(tolua_S,"Nation_Type"); tolua_usertype(tolua_S,"Player"); + tolua_usertype(tolua_S,"Unit_Type"); tolua_usertype(tolua_S,"Direction"); tolua_usertype(tolua_S,"Tech_Type"); - tolua_usertype(tolua_S,"Nation_Type"); - tolua_usertype(tolua_S,"Unit_Type"); - tolua_usertype(tolua_S,"City"); tolua_usertype(tolua_S,"Unit"); tolua_usertype(tolua_S,"Tile"); + tolua_usertype(tolua_S,"City"); } /* function: api_server_save */ diff -Nru freeciv-2.5.7/server/scripting/tolua_server_gen.h freeciv-2.5.8/server/scripting/tolua_server_gen.h --- freeciv-2.5.7/server/scripting/tolua_server_gen.h 2017-05-13 12:02:09.000000000 +0000 +++ freeciv-2.5.8/server/scripting/tolua_server_gen.h 2017-08-12 11:52:29.000000000 +0000 @@ -1,6 +1,6 @@ /* ** Lua binding: server -** Generated automatically by tolua 5.2.0 on Sat May 13 13:02:09 2017. +** Generated automatically by tolua 5.2.0 on Sat Aug 12 12:52:29 2017. */ /* Exported function */ diff -Nru freeciv-2.5.7/server/srv_main.c freeciv-2.5.8/server/srv_main.c --- freeciv-2.5.7/server/srv_main.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/srv_main.c 2017-08-12 11:47:32.000000000 +0000 @@ -773,33 +773,72 @@ = player_diplstate_get(plr3, plr2); struct player_diplstate *from2 = player_diplstate_get(plr2, plr3); - - notify_player(plr3, NULL, E_TREATY_BROKEN, ftc_server, - _("The cease-fire between %s and %s has run out. " - "They are at war. You cancel your alliance " - "with both."), - player_name(plr1), - player_name(plr2)); - - /* Cancel the alliance. */ - to1->has_reason_to_cancel = TRUE; - to2->has_reason_to_cancel = TRUE; - handle_diplomacy_cancel_pact(plr3, player_number(plr1), CLAUSE_ALLIANCE); - handle_diplomacy_cancel_pact(plr3, player_number(plr2), CLAUSE_ALLIANCE); - - /* Avoid asymmetric turns_left for the armistice. */ - to1->auto_cancel_turn = game.info.turn; - from1->auto_cancel_turn = game.info.turn; - - to2->auto_cancel_turn = game.info.turn; - from2->auto_cancel_turn = game.info.turn; - - /* Count down for this turn. */ - to1->turns_left--; - from1->turns_left--; - - to2->turns_left--; - from2->turns_left--; + const char *plr1name = player_name(plr1); + const char *plr2name = player_name(plr2); + bool cancel1; + bool cancel2; + + if (players_on_same_team(plr3, plr1)) { + fc_assert(!players_on_same_team(plr3, plr2)); + + cancel1 = FALSE; + cancel2 = TRUE; + + notify_player(plr3, NULL, E_TREATY_BROKEN, ftc_server, + _("The cease-fire between %s and %s has run out. " + "They are at war. You cancel your alliance " + "with %s."), + plr1name, plr2name, plr2name); + } else if (players_on_same_team(plr3, plr2)) { + + cancel1 = TRUE; + cancel2 = FALSE; + + notify_player(plr3, NULL, E_TREATY_BROKEN, ftc_server, + _("The cease-fire between %s and %s has run out. " + "They are at war. You cancel your alliance " + "with %s."), + plr1name, plr2name, plr1name); + } else { + + cancel1 = TRUE; + cancel2 = TRUE; + + notify_player(plr3, NULL, E_TREATY_BROKEN, ftc_server, + _("The cease-fire between %s and %s has run out. " + "They are at war. You cancel your alliance " + "with both."), + player_name(plr1), + player_name(plr2)); + } + + if (cancel1) { + /* Cancel the alliance. */ + to1->has_reason_to_cancel = TRUE; + handle_diplomacy_cancel_pact(plr3, player_number(plr1), CLAUSE_ALLIANCE); + + /* Avoid asymmetric turns_left for the armistice. */ + to1->auto_cancel_turn = game.info.turn; + from1->auto_cancel_turn = game.info.turn; + + /* Count down for this turn. */ + to1->turns_left--; + from1->turns_left--; + } + + if (cancel2) { + /* Cancel the alliance. */ + to2->has_reason_to_cancel = TRUE; + handle_diplomacy_cancel_pact(plr3, player_number(plr2), CLAUSE_ALLIANCE); + + /* Avoid asymmetric turns_left for the armistice. */ + to2->auto_cancel_turn = game.info.turn; + from2->auto_cancel_turn = game.info.turn; + + /* Count down for this turn. */ + to2->turns_left--; + from2->turns_left--; + } } } players_iterate_alive_end; break; diff -Nru freeciv-2.5.7/server/techtools.c freeciv-2.5.8/server/techtools.c --- freeciv-2.5.7/server/techtools.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/techtools.c 2017-08-12 11:47:32.000000000 +0000 @@ -502,8 +502,12 @@ return FALSE; } - if (research->bulbs_researched < - -total_bulbs_required(plr) * game.server.techloss_forgiveness / 100) { + /* First check is not for optimization only - it protects + * total_bulbs_required() from getting called before research + * has even been set to value other than A_UNSET. */ + if (research->bulbs_researched < 0 + && research->bulbs_researched < + -total_bulbs_required(plr) * game.server.techloss_forgiveness / 100) { return TRUE; } diff -Nru freeciv-2.5.7/server/unittools.c freeciv-2.5.8/server/unittools.c --- freeciv-2.5.7/server/unittools.c 2017-05-13 11:54:04.000000000 +0000 +++ freeciv-2.5.8/server/unittools.c 2017-08-12 11:47:32.000000000 +0000 @@ -1944,8 +1944,8 @@ Note that despite being saved from drowning, teleporting the units to "safety" may have killed them in the end. ****************************************************************************/ -bool try_to_save_unit(struct unit *punit, struct unit_type *pttype, - bool helpless, bool teleporting) +static bool try_to_save_unit(struct unit *punit, struct unit_type *pttype, + bool helpless, bool teleporting) { struct tile *ptile = unit_tile(punit); struct player *pplayer = unit_owner(punit); @@ -4164,16 +4164,16 @@ properly. ****************************************************************************/ int get_unit_vision_at(struct unit *punit, struct tile *ptile, - enum vision_layer vlayer) + enum vision_layer vlayer) { const int base = (unit_type(punit)->vision_radius_sq - + get_unittype_bonus(unit_owner(punit), ptile, unit_type(punit), - EFT_UNIT_VISION_RADIUS_SQ)); + + get_unittype_bonus(unit_owner(punit), ptile, unit_type(punit), + EFT_UNIT_VISION_RADIUS_SQ)); switch (vlayer) { case V_MAIN: - return base; + return MAX(0, base); case V_INVIS: - return MIN(base, 2); + return CLIP(0, base, 2); case V_COUNT: break; } diff -Nru freeciv-2.5.7/tools/mpcli.c freeciv-2.5.8/tools/mpcli.c --- freeciv-2.5.7/tools/mpcli.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/tools/mpcli.c 2017-08-12 11:47:32.000000000 +0000 @@ -123,21 +123,17 @@ } if (ui_options != -1) { - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; load_install_info_lists(&fcmp); log_normal(_("Freeciv modpack installer (command line version)")); - if (rev_ver == NULL) { - log_normal("%s%s", word_version(), VERSION_STRING); + log_normal("%s%s", word_version(), VERSION_STRING); - rev_ver = fc_git_revision(); - if (rev_ver != NULL) { - log_normal(_("commit: %s"), rev_ver); - } - } else { - log_normal("%s%s (%s)", word_version(), VERSION_STRING, rev_ver); + rev_ver = fc_git_revision(); + if (rev_ver != NULL) { + log_normal(_("commit: %s"), rev_ver); } log_normal("%s", ""); diff -Nru freeciv-2.5.7/tools/mpgui_gtk2.c freeciv-2.5.8/tools/mpgui_gtk2.c --- freeciv-2.5.7/tools/mpgui_gtk2.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/tools/mpgui_gtk2.c 2017-08-12 11:47:32.000000000 +0000 @@ -438,22 +438,17 @@ GtkTreeSelection *selection; const char *errmsg; char verbuf[2048]; - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; mbox = gtk_vbox_new(FALSE, 4); - if (rev_ver == NULL) { - rev_ver = fc_git_revision(); + rev_ver = fc_git_revision(); - if (rev_ver == NULL) { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); - } else { - fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), - word_version(), VERSION_STRING, rev_ver); - } + if (rev_ver == NULL) { + fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); } else { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s (%s)", word_version(), VERSION_STRING, - rev_ver); + fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), + word_version(), VERSION_STRING, rev_ver); } version_label = gtk_label_new(verbuf); diff -Nru freeciv-2.5.7/tools/mpgui_gtk3.c freeciv-2.5.8/tools/mpgui_gtk3.c --- freeciv-2.5.7/tools/mpgui_gtk3.c 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/tools/mpgui_gtk3.c 2017-08-12 11:47:32.000000000 +0000 @@ -438,25 +438,20 @@ GtkTreeSelection *selection; const char *errmsg; char verbuf[2048]; - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; mbox = gtk_grid_new(); gtk_orientable_set_orientation(GTK_ORIENTABLE(mbox), GTK_ORIENTATION_VERTICAL); gtk_grid_set_row_spacing(GTK_GRID(mbox), 4); - if (rev_ver == NULL) { - rev_ver = fc_git_revision(); + rev_ver = fc_git_revision(); - if (rev_ver == NULL) { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); - } else { - fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), - word_version(), VERSION_STRING, rev_ver); - } + if (rev_ver == NULL) { + fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); } else { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s (%s)", word_version(), VERSION_STRING, - rev_ver); + fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), + word_version(), VERSION_STRING, rev_ver); } version_label = gtk_label_new(verbuf); diff -Nru freeciv-2.5.7/tools/mpgui_qt.cpp freeciv-2.5.8/tools/mpgui_qt.cpp --- freeciv-2.5.7/tools/mpgui_qt.cpp 2017-05-13 11:59:04.000000000 +0000 +++ freeciv-2.5.8/tools/mpgui_qt.cpp 2017-08-12 11:47:32.000000000 +0000 @@ -189,20 +189,15 @@ QLabel *URL_label; QLabel *version_label; char verbuf[2048]; - const char *rev_ver = fc_svn_revision(); + const char *rev_ver; - if (rev_ver == nullptr) { - rev_ver = fc_git_revision(); + rev_ver = fc_git_revision(); - if (rev_ver == nullptr) { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); - } else { - fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), - word_version(), VERSION_STRING, rev_ver); - } + if (rev_ver == nullptr) { + fc_snprintf(verbuf, sizeof(verbuf), "%s%s", word_version(), VERSION_STRING); } else { - fc_snprintf(verbuf, sizeof(verbuf), "%s%s (%s)", word_version(), VERSION_STRING, - rev_ver); + fc_snprintf(verbuf, sizeof(verbuf), _("%s%s\ncommit: %s"), + word_version(), VERSION_STRING, rev_ver); } version_label = new QLabel(QString::fromUtf8(verbuf)); Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ar.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ar.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ar.po freeciv-2.5.8/translations/freeciv/ar.po --- freeciv-2.5.7/translations/freeciv/ar.po 2017-05-13 12:07:45.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ar.po 2017-08-12 11:54:30.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-10 18:00+0300\n" "Last-Translator: Ahmad M. Zawawi \n" "Language-Team: Arabic \n" @@ -345,12 +345,12 @@ "ال *%s (ذ.ا)* لقد هوجمنا بضراوة من %s، ونحتاج مساعدتك! أوفي بتحالفنا المجيد " "واسمك لن ينسى أبدا!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "ال %s قد توقف عن بناء ال %s في %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "ال %s قد بدء بناء ال %s في %s." @@ -382,7 +382,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -784,13 +784,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1916,10 +1916,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "علم" @@ -2662,7 +2662,7 @@ msgstr "أية أمة تريد أن تكون?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "اختيار الأمة" @@ -3345,16 +3345,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "الاسم" @@ -3477,11 +3477,11 @@ msgstr "الأمم" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "النوع" @@ -3655,9 +3655,9 @@ msgid "Seen (Invis)" msgstr " الوحدة" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "مجهول" @@ -3780,7 +3780,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "ارسل تقارير المشاكل إلى <%s>.\n" @@ -3804,7 +3804,7 @@ msgstr "كبسة Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4187,12 +4187,12 @@ msgid "Load Lua Script" msgstr "ت_حميل الوحدة" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "بناء مدينة جديدة" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4223,8 +4223,8 @@ msgid "Set local options" msgstr "إختيار الاختيارات الداخلية" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "اعدادات اللعبة" @@ -4638,8 +4638,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "بدأ لعبة _سيناريو" @@ -5037,7 +5037,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "هذا الأمر هو للعميل فقط." @@ -5048,7 +5048,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5056,374 +5056,367 @@ "%s client" msgstr "هذا الأمر هو للعميل فقط." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "هذا الأمر هو للعميل فقط." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "بدأ لعبة _جديدة" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "بدأ لعبة _سيناريو" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "تحميل لعبة محفوظة" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "الا_تصال بلعبة على الشبكة" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "الاتصال ب_منطقة اللعب" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "اختيار موقع الحفظ" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "ال_تصفّح..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "كلمات السر غير مطابقة، إدخل كلمة السر." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "اسم الخادم" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "المنفذ" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "اصدار" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "الحالة" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "اللاعبين" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "انساني" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "ملاحظة" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "الشبكة الداخلية" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "إنترنت _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "المضيف:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "ال_منفذ:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "اسم ال_مستخدم:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "كلمة ال_سر:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_تأكيد كلمة السر:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "المضيف" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "ا_تصال" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "اسم الاتصال: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "اسم اللاعب: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "المضيف: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "معلومات اللاعب والاتصال" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "معلومات %s " -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "تفعيل أو تعطيل جاهزية اللاعب" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "اختيار الأمة" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "مراقبة هذا اللاعب" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "أخذ مكان هذا اللاعب" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "فصل الاتصال" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "تفعيل أو تعطيل ال ذ.ا للاعب" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "إزالة اللاعب" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "اعطاء صلاحية info" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "وضع على %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "غير _جاهز" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_جاهز" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_بدء" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "مربع %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "اختيار الأ_مة" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "أخذ مكان هذا اللاعب" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "المراقب : %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_مراقبة" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "_لا تراقب" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "<ذ.ا سهل>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "عشوائي" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "متفرج" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "منفصل" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "عدد اللاعبين (مع ذ.ا):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "مستوى مهارة ال _ذ.ا:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "الصحراء" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "خيارات اللعبة أكثر..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "السجل" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "التقدير" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "جاهز" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?Player:الاسم" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "فريق" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "اختيار اللعبة المحفوظة للتحميل" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "اختيار اللعبة المحفوظة لل_تحميل:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "إختيار سيناريو" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "إختيار _سيناريو:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "اسم ملف الحفظ:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "حفظ اللعبة" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "ال_لعب المحفوظة:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "اسم ملف الحفظ:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "بدأ لعبة _سيناريو" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "بدأ لعبة _سيناريو" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "حفظ اللعبة" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "ال_لعب المحفوظة:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "ال_لعب المحفوظة:" @@ -5965,7 +5958,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "كلمة ال_سر:" @@ -6005,7 +5998,7 @@ msgstr "مدينة المنشأ الجديدة" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "تحميل" @@ -6282,8 +6275,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6475,7 +6468,7 @@ msgstr[1] "هل تريد الخروج?" msgstr[2] "هل تريد الخروج?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6491,7 +6484,7 @@ msgid "Yes" msgstr "نعم" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6580,13 +6573,13 @@ msgid "This is Qt-client for Freeciv." msgstr "عميل لFreeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_لا تراقب" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_مراقبة" @@ -6620,7 +6613,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "خروج" @@ -6796,9 +6789,9 @@ msgid "Game" msgstr "اللعبة" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "الخيارات" @@ -6827,8 +6820,8 @@ msgid "Leave game" msgstr "حفظ اللعبة" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7116,7 +7109,7 @@ msgstr "نسبة الضريبة..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7169,7 +7162,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "اعادة تحميل" @@ -7180,143 +7173,137 @@ msgstr "تطبيق لمرة واحدة" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "هذا الأمر هو للعميل فقط." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "وحدة %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "هذا الأمر هو للعميل فقط." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "هذا الأمر هو للعميل فقط." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "بدء لعبة جديدة" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "بدأ لعبة _سيناريو" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "تحميل لعبة محفوظة" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "الا_تصال بلعبة على الشبكة" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "توصيل" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "اسم الدخول:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "كلمة السر:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_تأكيد كلمة السر:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "إنترنت _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "متفرج" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "ال_تصفّح..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "بدأ لعبة _سيناريو" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "القائد:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "فصل" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "بدء" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "أخذ مكان هذا اللاعب" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "اسم ملف الحفظ:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "بدأ لعبة _سيناريو" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "بدأ لعبة _سيناريو" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "متفرج" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "غير _جاهز" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", مستوى الصعوبة %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "وضع على %s" @@ -7428,7 +7415,7 @@ msgid "Back" msgstr "رجوع" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "تحميل لعبة" @@ -8615,44 +8602,38 @@ msgstr "إضافة قائمة عمل جديدة" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "برنامج Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "برنامج Freeciv اصدار %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "هذا الأمر هو للعميل فقط." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "بدء لعبة جديدة" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "الالتحاق بلعبة" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "الالتحاق ب Pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "الالتحاق بخادم على الشبكة الداخلية" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "يرحب SDLClient بك..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "مدينة %s" @@ -15924,83 +15905,83 @@ msgid "?unitflag:Hunter" msgstr "طائرة عامودية" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "برنامج Freeciv اصدار %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(اصدار بيتا)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "برنامج Freeciv اصدار %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "برنامج Freeciv اصدار %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "إصدار اختبار بيتا" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "اصدار" -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "كانون ثاني" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "شباط" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "آذار" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "نيسان" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "أيار" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "حزيران" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "تموز" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "آب" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "أيلول" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "تشرين أول" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "تشرين ثاني" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "كانون أول" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16010,7 +15991,7 @@ "برنامج Freeciv %s سيتم اصداره في \n" "%s, في %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16020,7 +16001,7 @@ "برنامج Freeciv %s سيتم اصداره في \n" "%s, في %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "لأن الحضارة يجب أن تكون مجانية!" @@ -16837,61 +16818,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:أوروبي" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:كلاسيكي" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:استوائي" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:اسيوي" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:بابلي" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:الكيلتي" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:عهد النهضة" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:صناعي" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:حديث" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:بعد الحديث" @@ -18627,18 +18608,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "الجدد" @@ -19272,14 +19253,14 @@ msgstr "كلّ عربة أنت القوافل دوران!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "قائد بربري" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21027,9 +21008,9 @@ "territory." msgstr "المستكشفون مفيدون جدا لتخطيط مناطق مجهولة." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21394,8 +21375,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:الكيلتي" @@ -21794,13 +21775,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "هذا هو أنت. إذا خسرت هذه الوحدة، فستخسر اللعبة, فلا تخسرها." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "فقط." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "نظام التحذير والسيطرة الطائر AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 #, fuzzy msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " @@ -28905,20 +28892,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "مجهول" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -28973,12 +28960,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "اختيار التقدم لسرقته" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "تم نقل %s بنجاح." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29010,14 +28997,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "هل تريد الخروج?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29026,60 +29013,60 @@ msgid "Failed to start downloader" msgstr "خطأ انشاء لاعب ذ.ا جديد: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "اختيار التقدم لسرقته" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "اختيار التقدم لسرقته" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "اختيار التقدم لسرقته" @@ -29357,104 +29344,104 @@ msgid "A poorly-named city" msgstr "اسم مدينة ضعيف" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "تغيير مدينة المنشأ من %s إلى %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "تحويل %s في %s من %s إلى %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "تحويل %s من %s إلى %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s فقدت عند التحويل إلى %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s فقدت عند السيطرة على %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "تم بناء %s من جديد في %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "عندك أصلا مدينة اسمها %s. تم اعادة تسميتها إلى %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "يتفاجئ الناس في %s بامكانياتك التكنولوجية!\n" " يقوم العمال لوحدهم بجمع وتطوير المدينة بالسكك الحديدية." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "لقد انشأت %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "تم تحريك %s خارج المدينة المسرحة %s لتجنب قلة الأراضي." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "عندما تم تسريح %s ال %s لم تستطع الخروج، ولهذا فقدت." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "عندما تم تسريح %s ال %s لم تستطع الخروج، ولهذا فقدت." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "لقد دمرت %s كليا." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "دمرت %s من قبل %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -29462,7 +29449,7 @@ msgstr[1] "لقد احتللت %s; تراكمت غنائم نهبك إلى %d ذهب!" msgstr[2] "لقد احتللت %s; تراكمت غنائم نهبك إلى %d ذهب!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -29470,17 +29457,17 @@ msgstr[1] "احتل %s مدينة %s ونهب %d من الذهب منها." msgstr[2] "احتل %s مدينة %s ونهب %d من الذهب منها." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "لقد احتللت %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s احتل %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -29488,7 +29475,7 @@ msgstr[1] "لقد حررت %s! تراكمت غنائم النهب إلى %d ذهب." msgstr[2] "لقد حررت %s! تراكمت غنائم النهب إلى %d ذهب." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -29496,54 +29483,54 @@ msgstr[1] "حرر %s مدينة %s ونهب %d من الذهب منها." msgstr[2] "حرر %s مدينة %s ونهب %d من الذهب منها." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "لقد حررت %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s حرر %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "آسف, الغى %s طريق التجارة من %s إلى مدينتك %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "آسف, الغى %s طريق التجارة من %s إلى مدينتك %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " من قائمة العمل" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s يبني %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -29551,17 +29538,17 @@ msgstr[1] "لقد بعت %s في %s (اﻵن محاط باليابسة) ب %d ذهب." msgstr[2] "لقد بعت %s في %s (اﻵن محاط باليابسة) ب %d ذهب." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "ال %s من %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "قاعدة جوية" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -29834,20 +29821,21 @@ msgid "The %s have started building a spaceship!" msgstr "بدأ %s ببناء سفينة فضاء!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "لا يستطيع %s بناء %s حتى اﻵن." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* يستطيع بناء مدن جديدة.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "انهى %s بناء %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -29855,76 +29843,76 @@ msgstr[1] "" msgstr[2] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "لا يمكن الاحتفاظ ب %s في %s, تم بيع البناية!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "الذهب غير كافي. تم تسريح %s" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "تلوث قرب %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "نحن نحب يوم %s الذي الغي به في %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "نحن نحب يوم %s الذي الغي به في %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "عصيان مدني في %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "يستمر العصيان المدني في %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "تم استعادة النظام في %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "أطاح الشعب ب %s, بلدك في صراع." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "لا يستطيع %s بناء %s حتى اﻵن، ولا نستطيع تسريح مدينتنا الوحيدة." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "تم تسريح %s إلى %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29932,7 +29920,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29940,91 +29928,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "تم تسريح %s إلى %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "تم قصف %s بالسلاح النووي من قبل %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "تلوث قرب %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "تؤدي المجاعة إلى تقليل عدد السكان في %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "دمر %s ال %s في %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "لقد دمرت وحدتك %s ال %s في %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "تم تطوير الانتاج من %s إلى %s في %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -31784,32 +31772,32 @@ msgid "Your %s was captured after completing the mission." msgstr "تم القبض على وحدتك %s بعد اتمام مهمتها." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "لقد سببت حادثا عند رشوة وحدة %s%s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "لقد سبب %s حادثا عند رشوة وحدتك %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "لقد سببت حادثا عند محاولة سرقة تكنولوجيا من %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "لقد سبب %s حادثا عند محاولة سرقة تكنولوجيا منك." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "لقد سببت حادثا عند محاولة التحريض على ثورة في %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "لقد سبب %s حادثا عند محاولة التحريض على ثورة في %s." @@ -32132,19 +32120,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "مدة الخروج أقل من الصفر، جاري تثبيت على الصفر." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "كتلة أرض عالية - هذا سيأخد بعض الثواني." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "لم يضع المولّد 3 كل الجزر الكبيرة." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "ترك المولّد 3 %li كتل أرضية بدون مكان." @@ -32317,12 +32305,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "تم تحريك وحدتك %s لتغير التضاريص." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "تم تسريح وحدتك %s لتغير التضاريص." @@ -33027,8 +33015,8 @@ "يحتوي الملف المحفوظ على بيانات خريطة غير كاملة. يمكن أن يحدث هذا مع اللعب " "المحفوظة القديمة، أو يمكن أن يعني ملفا محفوظا خاطئ. استمر على مسئوليتك." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "تم إضافة %s كلاعب ذكاء اصتناعي من مستوى %s." @@ -35573,56 +35561,63 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "انتهى وقف إطلاق النار مع %s. أنت اﻵن في حرب مع %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "أعلن زميلك في الفريق %s الحرب على %s. أنت مجبر أن تلغي تحالفك مع %s." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "أعلن زميلك في الفريق %s الحرب على %s. أنت مجبر أن تلغي تحالفك مع %s." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "الخيارات المدعومة: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "فشل حفظ اللعبة ك %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "تم حفظ اللعبة ك %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "اللعبة أصلا شغالة." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "فقد %s سيطرة cmdlevel عند بداية اللعبة. استخدم التصويت من اﻵن فصاعدا." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "جاري بدء اللعبة." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "طلب لتقرير مجهول (نوع %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "تحذير: جاري رفض عميل قديم %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 #, fuzzy msgid "" "Your client is too old. To use this server, please upgrade your client to a " @@ -35631,83 +35626,83 @@ "عميلك قديم جدا. لاستخدام هذا الخادم الرجاء التطوير العميل إلى اصدار CVS بعد " "2003-11-28 أو Freeciv 2.2 وبعد." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "لا يُسْمَح لك تغيير هذا الخيار." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "الأمة %s غير متوفرة في هذا السيناريو." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "الأمة %s أصلا مستعملة." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s حاكم %s على %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "جاري الانتظار لبدء اللعبة، %d من %d لاعب جاهز لبدء اللعب." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s يحكم %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "جاري إرسال المعلومات إلى metaserver [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "انتهت اللعبة..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "* لا تستطيع بناء المدن على هذه التضاريص." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "الخيار: %s تم تغييره إلى \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "جاري اﻵن استقبال اتصالات عملاء جدد." @@ -37533,56 +37528,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "زيادة انتاج العلوم في مدينة ب50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "الهدف التكنولوجي هو %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "لقد سرقت %s من ال %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "سرق %s ال %s منك!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "سرق %s %s من ال %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -38507,6 +38502,21 @@ msgstr "خطأ %d (ترجم بدون strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "هذا الأمر هو للعميل فقط." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "هذا الأمر هو للعميل فقط." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "برنامج Freeciv اصدار %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "لا يستطيع %s بناء %s حتى اﻵن." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/bg.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/bg.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/bg.po freeciv-2.5.8/translations/freeciv/bg.po --- freeciv-2.5.7/translations/freeciv/bg.po 2017-05-13 12:07:45.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/bg.po 2017-08-12 11:54:30.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: freeciv 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-06-10 00:52+0200\n" "Last-Translator: Bogdan Marinov \n" "Language-Team: Bulgarian\n" @@ -298,12 +298,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%sте спряха строежа на %s в %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%sте започнаха да строят %s в %s." @@ -335,7 +335,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -716,13 +716,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1786,10 +1786,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Флаг" @@ -2504,7 +2504,7 @@ msgstr "Каква нация ще бъдеш?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 #, fuzzy msgid "Pick Nation" @@ -3138,16 +3138,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Име" @@ -3258,11 +3258,11 @@ msgstr "Нации" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Тип" @@ -3419,9 +3419,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "" @@ -3540,7 +3540,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "" @@ -3564,7 +3564,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Карта" @@ -3934,12 +3934,12 @@ msgid "Load Lua Script" msgstr "_Натоварване" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Основаване на нов град" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -3967,8 +3967,8 @@ msgid "Set local options" msgstr "" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "" @@ -4346,8 +4346,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "" @@ -4707,7 +4707,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "" @@ -4718,7 +4718,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4726,369 +4726,362 @@ "%s client" msgstr "Freeciv версия %s %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Freeciv версия %s %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Нова игра" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Нова игра по _сценарий" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Запазена игра" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "С_вързване с мрежова игра" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Файлове..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Име на сървъра" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Порт" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Версия" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Състояние" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Играчи" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Хора" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Коментар" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Локална мрежа" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Интернет _метасървър" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Хост:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Порт:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "Потр. _име:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Па_рола" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Потв. пар_олата:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Хост" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Свързване" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Инфо за %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Избор на нация" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Добавяне към %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Старт" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Избор на _нация" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 #, fuzzy msgid "_Observe" msgstr "_Кибичене" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s ИИ>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Случайна" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 #, fuzzy msgid "Observer" msgstr "Кибик" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Брой _играчи (включително ИИ):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Ниво на _умение на ИИ:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Глава:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "О_ще настройки на играта..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Готовност" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Лидер" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Отбор" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Коя запазена игра да се зареди?" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Коя запазена игра да се _зареди?" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Избор на _сценарий:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Име на файла:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Избор на _сценарий:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Избор на _сценарий:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "_Запазване на играта" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "" @@ -5599,7 +5592,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "За допълнителна информация щракнете върху гражданите." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Па_рола" @@ -5640,7 +5633,7 @@ msgstr "Промяна след:" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Натоварване" @@ -5904,8 +5897,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6091,7 +6084,7 @@ msgstr[0] "Наистина ли искаш да излезеш?" msgstr[1] "Наистина ли искаш да излезеш?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6107,7 +6100,7 @@ msgid "Yes" msgstr "Да" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6195,13 +6188,13 @@ msgid "This is Qt-client for Freeciv." msgstr "" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_Кибичене" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Кибичене" @@ -6235,7 +6228,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Изход" @@ -6400,9 +6393,9 @@ msgid "Game" msgstr "" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "" @@ -6431,8 +6424,8 @@ msgid "Leave game" msgstr "Напускане на играта" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6705,7 +6698,7 @@ msgstr "" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6757,7 +6750,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "" @@ -6767,137 +6760,131 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Freeciv версия %s %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Единица: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Freeciv версия %s %s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s държава, управлявана като %s (%s)" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Начало на нова игра" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Нова игра по _сценарий" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "_Запазена игра" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "С_вързване с мрежова игра" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Потр. _име:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Потв. пар_олата:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Интернет _метасървър" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Кибик" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Файлове..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Избор на _сценарий:" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "_Лидер:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Редактиране на списъци със задачи" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Избор на _сценарий:" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Добавяне към %s" @@ -7003,7 +6990,7 @@ msgid "Back" msgstr "" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "" @@ -8092,44 +8079,38 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv версия %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv версия %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Freeciv версия %s %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Начало на нова игра" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Присъединяване към игра" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Единица: %s" @@ -14721,97 +14702,97 @@ msgid "?unitflag:Hunter" msgstr "?клас:Хеликоптерни" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv версия %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(бета версия)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv версия %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv версия %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "версия " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "януари" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "февруари" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "март" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "април" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "май" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "юни" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "юли" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "август" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "септември" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "октомври" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "ноември" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "декември" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" "Freeciv %s will be released in %s, at %s" msgstr "" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" "Freeciv %s will be released at %s" msgstr "" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "'Щото цивилизацията трябва да е свободна!" @@ -15612,61 +15593,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Европейски" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Класически" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Тропичен" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Азиатски" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Вавилонски" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Келтски" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Ренесансов" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Индустриален" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Модерен" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Пост-модерен" @@ -17360,18 +17341,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "зелена" @@ -18030,14 +18011,14 @@ "ход!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Варварски лидер" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -19735,9 +19716,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20079,8 +20060,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Електрически" @@ -20461,13 +20442,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Може да бъде създадена само от варвари.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "“Летящо око“" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -27272,19 +27259,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -27338,11 +27325,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -27374,14 +27361,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Наистина ли искаш да излезеш?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -27389,58 +27376,58 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "" @@ -27708,203 +27695,203 @@ msgid "A poorly-named city" msgstr "" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "" #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%2$s разруши %1$s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s освободи %s и плячкоса %d жълтица от града." msgstr[1] "%s освободи %s и плячкоса %d жълтици от града." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "В %s се строи %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "" -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -28156,96 +28143,97 @@ msgid "The %s have started building a spaceship!" msgstr "%sте започнаха да строят звездолет!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s все още не може да завърши %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Може да основава нови градове.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "В %s приключи създаването на %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, fuzzy, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "Единицата %s струва %d население. %s намалява до размер %d." msgstr[1] "Единицата %s струва %d население. %s намалява до размер %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Твърде е скъпо да има %s в %s, продадохме сградата!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Замърсяване в близост до %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Празненства във ваша чест в %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "Чума порази %s! Загубихме население!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Безредици в %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "БЕЗРЕДИЦИТЕ ПРОДЪЛЖАВАТ в %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Редът беше възстановен в %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Народът свали от власт нашата %s, страната е във хаос." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -28253,7 +28241,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -28261,91 +28249,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%2$s разруши %1$s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Замърсяване в близост до %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Население: %s" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "?разрушено:Р" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Редът беше възстановен в %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Страницата за производството" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -29995,32 +29983,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -30338,19 +30326,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -30511,12 +30499,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -31191,8 +31179,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s беше добавен като играч контролиран от %s ИИ." @@ -33501,136 +33489,143 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Прекратяването на огъня с %s изтече. Сега сме във война с %sте." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "Прекратяването на огъня с %s изтече. Сега сме във война с %sте." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "" -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "" -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Край на играта..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "%2$s разруши %1$s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -35396,56 +35391,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Новата технологична цел е %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Откраднахме %s от %sте." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%sте откраднаха от нас %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%sте са откраднали %s от %sте." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -36332,6 +36327,21 @@ msgid "error %d (compiled without strerror)" msgstr "" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Freeciv версия %s %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s държава, управлявана като %s (%s)" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv версия %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s все още не може да завърши %s." + #~ msgid "Ruleset _Version:" #~ msgstr "_Версия на правилата:" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ca.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ca.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ca.po freeciv-2.5.8/translations/freeciv/ca.po --- freeciv-2.5.7/translations/freeciv/ca.po 2017-05-13 12:07:46.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ca.po 2017-08-12 11:54:31.000000000 +0000 @@ -6,21 +6,21 @@ # David , 2003. # Joan Creus , 2007, 2008, 2009, 2010, 2011. # David , 2007. -# Joan Creus , 2011, 2012, 2013, 2014, 2015, 2016. +# Joan Creus , 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2016-07-28 16:24+0200\n" -"Last-Translator: \n" -"Language-Team: Catalan \n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-05 21:24-0800\n" +"Last-Translator: Joan Creus \n" +"Language-Team: Catalan \n" "Language: ca\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-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 2.0\n" #: ai/default/advdiplomacy.c:341 #, c-format @@ -351,12 +351,12 @@ "*%s (IA)* Hem patit un atac salvatge de %s, i necessitem la vostra ajuda!" "Honora la nostra gloriosa aliança i el teu nom no serà mai oblidat!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Els %s han deixat de construir %s a %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Els %s han començat a construir %s a %s." @@ -393,7 +393,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -787,13 +787,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1906,10 +1906,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bandera" @@ -2631,7 +2631,7 @@ msgstr "Quina nació seràs?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Tria Nació" @@ -3291,16 +3291,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nom" @@ -3410,11 +3410,11 @@ msgstr "Nacions" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipus" @@ -3586,9 +3586,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Desconegut" @@ -3710,7 +3710,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Informa dels errors a %s\n" @@ -3734,7 +3734,7 @@ msgstr "Maj.+Retorn" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Vista" @@ -4104,12 +4104,12 @@ msgid "Load Lua Script" msgstr "Carregar Script Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construcció de Ciutat Nova" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4139,8 +4139,8 @@ msgid "Set local options" msgstr "Establir les opcions locals" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Opcions de Partida" @@ -4514,8 +4514,8 @@ msgid "Game/Scenario Properties" msgstr "Propietats de Partida/Escenari" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Desar Escenari" @@ -4875,7 +4875,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, client %s" @@ -4886,7 +4886,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4897,267 +4897,260 @@ "versió: %s\n" "client %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), client %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Començar Partida _Nova" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Començar Partida en _Escenari" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Carregar Partida Desada" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onnectar a Partida en Xarxa" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Connectar a _Zona de Jocs" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Tria el Lloc on Desar" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Navega..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Les contrasenyes no coincideixen, entra la contrasenya." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nom del servidor" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versió" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Estat" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Jugadors" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Humans" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Comentari" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Xarxa d'_Area Local" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Metaservidor d'Internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Contra_senya:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irmar la Contrasenya:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_onnectar" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nom de connexió: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nom del jugador: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Info Jugador/conn" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Info %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Commutar disponibilitat jugador" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Tria nació" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observar aquest jugador" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Agafar aquest jugador" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Tallar connexió" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Commutar IA per jugador" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Eliminar jugador" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Donar accés %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Posar a %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "No _preparat" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Totes Preparades" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Iniciar" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Agafar %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Tria _Nació" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Agafar un Jugador" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Observar %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observar" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "No O_bservar" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Aleatori" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observador" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Desassociat" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5165,95 +5158,95 @@ "Nombre de _Jugadors\n" "(comptant IA):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Nivell de _Dificultat dels IA:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Joc de regles:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Més _Opcions de Joc..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Registrar" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Valoració" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Preparat" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Líder" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Equip" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Tria Partida Desada per Carregar" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Tria Partida Desada per _Carregar:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Tria un Escenari" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Tria un _Escenari:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nom de fitxer:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Desar la Partida" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Partides _Desades:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Nom de _Fitxer a Desar:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Esce_naris Desats:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Desar Esc_enari:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Desar Imatge de Mapa" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "_Imatges de Mapa Desades:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Desar Imatges de _Mapa:" @@ -5771,7 +5764,7 @@ msgstr "" "Es pot obtenir més informació%sfent clic esquerre al damunt dels ciutadans." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Nova Contra_senya:" @@ -5808,7 +5801,7 @@ msgstr "Canviar ciutat base" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Carregar" @@ -6046,8 +6039,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6223,7 +6216,7 @@ msgstr[0] "Segur que voleu desmobilitzar aquesta unitat %1?" msgstr[1] "Segur que voleu desmobilitzar aquestes unitats %1?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6239,7 +6232,7 @@ msgid "Yes" msgstr "Sí" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6326,12 +6319,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Això és el client-Qt de Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "No Observar" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Observar" @@ -6365,7 +6358,7 @@ "del Qt després de '--'. Vegeu la documentació de Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Sortir?" @@ -6514,9 +6507,9 @@ msgid "Game" msgstr "Joc" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opcions" @@ -6541,8 +6534,8 @@ msgid "Leave game" msgstr "Deixar la Partida" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6801,7 +6794,7 @@ msgstr "Taxes..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Jugadors" @@ -6849,7 +6842,7 @@ msgid "... read more in help" msgstr "... llegiu-ne més a l'ajuda" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Refrescar" @@ -6859,123 +6852,117 @@ msgstr "Aplicar" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "Client Qt, %s%s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "versió: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Client Qt" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "Client Qt, %s%s (%s)" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Començar una partida nova" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Començar partida en escenari" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Carregar partida desada" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Connectar a partida en xarxa" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Connectar" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Login" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Contrasenya" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Confirmar la Contrasenya" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Servidors d'Internet:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Servidors locals:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Data" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Navega..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Carregar Escenari" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Líder" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Desconnectar" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Iniciar" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Partides Desades" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Obrir Partida Desada" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Fitxers d'Escenari" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Obrir Fitxer d'Escenari" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Observadors globals" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "No preparat" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Canviar la dificultat" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Posar a l'equip" @@ -7078,7 +7065,7 @@ msgid "Back" msgstr "Enrere" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Carregar una partida" @@ -8208,44 +8195,38 @@ msgstr "Afegir nova llista treball" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "client %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Començar una partida nova" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Unir-se a una partida" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Unir-se a Pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Unir-se a servidor de LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "El client SDL et dóna la benvinguda..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Versió: %s" @@ -15348,83 +15329,83 @@ msgid "?unitflag:Hunter" msgstr "Caçador" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versió %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versió beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versió %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versió %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versió beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versió " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Gener" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Febrer" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Març" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Abril" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Maig" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juny" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juliol" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Agost" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Setembre" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Octubre" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Novembre" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Desembre" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15433,7 +15414,7 @@ "AQUESTA VERSIÓ ÉS BETA\n" "Freeciv %s serà llançat el %s, a %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15442,7 +15423,7 @@ "AQUESTA VERSIÓ ÉS BETA\n" "Freeciv %s serà alliberat el %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Perquè cal que la civilització sigui lliure!" @@ -16374,61 +16355,61 @@ "Cada recaptador d'impostos genera dues peces d'or addicionals per al teu " "tresor a cada torn." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Europeu" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Clàssic" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropical" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Asiàtic" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babilònic" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Cèltic" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renaixentista" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industrial" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Postmodern" @@ -18249,18 +18230,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "novell" @@ -19036,14 +19017,14 @@ "en només un torn!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Líder bàrbar" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21034,9 +21015,9 @@ "Els exploradors són individus valents que són molt útils per descobrir el " "territori." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21469,8 +21450,8 @@ "Cada recaptador d'impostos genera tres peces d'or addicionals per al teu " "tresor a cada torn." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "EraElèctrica" @@ -21934,13 +21915,18 @@ "Aquest ets tu. Si perds aquesta unitat, perds la partida. Així que millor " "que no ho facis." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "No sortiran bàrbars de les cabanes." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -24998,7 +24984,7 @@ "senat que bloquejarà la cancel·lació no provocada d'un tractat; si un " "Diplomàtic o Espia estrangers no provoquen un incident diplomàtic, l'única " "manera de dissoldre un pacte en aquesta situació és dissoldre el govern. Els " -"detalls dels pactes es descriuren a la secció de Diplomàcia." +"detalls dels pactes es descriuen a la secció de Diplomàcia." #: data/helpdata.txt:235 msgid " A couple of notes:" @@ -25738,8 +25724,8 @@ "between the two cities, controlled by the 'trademindist' server option " "(default nine tiles)." msgstr "" -"El joc de regles pot limitaar la capacitat de comerciar, o el benefici de " -"fer-ho segons si les dues ciutats són en continents diferents i/o en nacions " +"El joc de regles pot limitar la capacitat de comerciar, o el benefici de fer-" +"ho segons si les dues ciutats són en continents diferents i/o en nacions " "diferents. Per les rutes domèstiques, cal una distància mínima entre les " "dues ciutats, que depèn de l'opció de servidor 'trademindist' (el nombre " "predeterminat són nou caselles)." @@ -25923,8 +25909,8 @@ "de producció, sigui quin sigui el terreny. També obté qualsevol avantatge " "que ofereix el terreny amb un sistema de regadiu (perquè les ciutats vénen " "amb sistemes d'aigua incorporats), però això no es pot fer servir com a base " -"a partir de la qual regar d'altres caselles; i normalment " -"portaautomàticament camins (l'únic cas que no és si la ciutat és en un riu i " +"a partir de la qual regar d'altres caselles; i normalment porta " +"automàticament camins (l'únic cas que no és si la ciutat és en un riu i " "encara no coneixes Construcció de Ponts; un cop l'aprens, les ciutats de riu " "també tindran carreteres). D'altres jocs de regles poden tenir detalls " "diferents." @@ -31277,19 +31263,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Desconeguda" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "No instal·lat" @@ -31345,11 +31331,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Instal·lador de modpacks de Freeciv (versió de línia de comandes)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Modpack instal·lat amb èxit" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "La instal·lació del modpack ha fallat: %s" @@ -31381,7 +31367,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Instal·lar automàticament el modpack des d'una URL donada" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31389,7 +31375,7 @@ "La instal·lació del modpack està en curs.\n" "Segur que vols sortir?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Ja hi ha una altra baixada activa" @@ -31397,7 +31383,7 @@ msgid "Failed to start downloader" msgstr "No s'ha pogut engegar el mòdul de baixades" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31406,40 +31392,40 @@ "%s%s\n" "versió: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Instal·lat" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Tipus" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Subtipus" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Llicència" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Instal·lar el modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL del modpack" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Seleccionar quin modpack s'ha d'instal·lar" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31450,11 +31436,11 @@ "del Gtk després de '--'. Vegeu la documentació de Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Instal·lador de modpacks de Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Instal·lador de modpacks de Freeciv (gtk3)" @@ -31744,82 +31730,82 @@ msgid "A poorly-named city" msgstr "Una ciutat amb un nom desafortunat" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Canviada la ciutat origen de %s a %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "Els %s ja tenen %s. No pots passar-los el teu." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Transferit %s a %s des de %s fins %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Transferit %s des de %s fins %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%1$s %2$s perdut en transferència a %4$s (%3$s)." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Perdut %s en perdre el control de %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "S'ha construït un %s de recanvi a %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Ja tenies una ciutat anomenada %s. La ciutat s'ha renomenat a %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "La gent de %s estan aclaparats pel teu nivell tecnològic!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Els treballadors s'apleguen espontàniament i instal·len %2$s a %1$s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Els treballadors s'apleguen espontàniament i milloren %s camins." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Els treballadors s'apleguen espontàniament i milloren %s bases." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Has fundat %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "S'ha mogut %s fora de la ciutat %s que s'ha desmantellat perquè no es pot " "quedar a %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -31827,7 +31813,7 @@ "Quan %s ha estat desmantellada, el %s no ha pogut sortir-ne, i per tant, " "s'ha perdut." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -31835,81 +31821,81 @@ "Quan %s ha estat desmantellada, el teu %s de %s hi ha quedat atrapat, i per " "tant, s'ha perdut." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Destrueixes %s completament." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s ha estat destruïda per %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Conquereixes %s, el botí puja a %d peça d'or!" msgstr[1] "Conquereixes %s, el botí puja a %d peces d'or!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s ha conquerit %s i ha fet un botí de %d peça d'or de la ciutat." msgstr[1] "%s ha conquerit %s i ha fet un botí de %d peces d'or de la ciutat." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Conquereixes %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s ha conquerit %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Has alliberat %s!! El botí suma %d peça d'or." msgstr[1] "Has alliberat %s!! El botí suma %d peces d'or." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s ha alliberat %s i ha fet un botí de %d peça d'or de la ciutat." msgstr[1] "%s ha alliberat %s i ha fet un botí de %d peces d'or de la ciutat." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Has alliberat %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s ha alliberat %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "El comerç entre %s i %s s'ha perdut amb la ciutat." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Ruta comercial entre %s i %s cancel·lada." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "El comerç entre la ciutat del %s %s i %s es perd amb la ciutat." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" @@ -31917,38 +31903,38 @@ "%s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Hem cancel·lat la ruta comercial des de %s fins a la ciutat %s %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " de la llista de treball" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s està construint %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vens %s a %s (ara encallat) per %d peça d'or." msgstr[1] "Vens %s a %s (ara encallat) per %d peces d'or." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "La mida del mapa de la ciutat de %s és %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "augmentat" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "reduït" @@ -32225,77 +32211,80 @@ msgid "The %s have started building a spaceship!" msgstr "Els %s han començat a construir una nau espacial!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s encara no pot construir %s." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" +"%s encara no pot construir %s. (mida ciutat: %d, cost en població de la " +"unitat: %d)" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s ha acabat de construir %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "Els %s costen %d punt de població. %s s'encongeix a mida %d." msgstr[1] "Els %s costen %d punts de població. %s s'encongeix a mida %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "No es pot mantenir %s a %s, s'ha venut l'edifici!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "No hi ha prou or. %s desmobilitzada." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Contaminació a prop de %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Celebracions en honor teu a %s" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Celebracions cancel·lades a %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s ha estat afectada per una epidèmia! Es perd població!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Desordre civil a %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "EL DESORDRE CIVIL CONTINUA A %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "S'ha restablert l'ordre a %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "La gent ha destronat el teu %s, hi ha desordres al teu país." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32303,20 +32292,20 @@ "tenim." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s desmantellada en %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "Els emigrants de %s no poden anar a %s perquè no hi ha prou menjar!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32325,7 +32314,7 @@ "Els emigrants de %s no poden anar a %s (%s) perquè no hi ha prou menjar!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32334,7 +32323,7 @@ "Els emigrants de %s (%s) no poden anar a %s perquè no hi ha prou menjar!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32343,7 +32332,7 @@ "créixer!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32352,7 +32341,7 @@ "créixer!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32360,65 +32349,65 @@ "Els emigrants de %s (%s) no poden anar a %s perquè necessita una millora per " "créixer!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s ha estat abandonada pels seus ciutadans." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Emigrants de %s han anat a %s buscant una vida millor." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Emigrants de %s han anat a %s (%s) buscant una vida millor." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Emigrants de %s (%s) han anat a %s buscant una vida millor." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%s ha patit un %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Contaminació radioactiva a prop de %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s causa pèrdua de població a %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s destrueix %s a %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Tot el menjar emmagatzemat ha quedat destruït a %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "La producció de %s a %s ha quedat destruïda." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -32426,7 +32415,7 @@ "de vida." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33153,7 +33142,7 @@ #: server/commands.c:349 msgid "Set one or all AI players to 'novice'." -msgstr "Estableix un o tots el jugadors d'IA a 'principiant'." +msgstr "Estableix un o tots els jugadors d'IA a 'principiant'." #: server/commands.c:350 msgid "" @@ -33177,7 +33166,7 @@ #: server/commands.c:359 msgid "Set one or all AI players to 'easy'." -msgstr "Estableix un o tots el jugadors a 'fàcil'." +msgstr "Estableix un o tots els jugadors a 'fàcil'." #: server/commands.c:360 msgid "" @@ -33200,7 +33189,7 @@ #: server/commands.c:369 msgid "Set one or all AI players to 'normal'." -msgstr "Estableix un o tots el jugadors a 'normal'." +msgstr "Estableix un o tots els jugadors a 'normal'." #: server/commands.c:370 msgid "" @@ -33223,7 +33212,7 @@ #: server/commands.c:379 msgid "Set one or all AI players to 'hard'." -msgstr "Estableix un o tots el jugadors a 'difícil'." +msgstr "Estableix un o tots els jugadors a 'difícil'." #: server/commands.c:380 msgid "" @@ -33247,7 +33236,7 @@ #: server/commands.c:389 msgid "Set one or all AI players to 'cheating'." -msgstr "Assigna un o tots el jugadors IA a 'trampós'." +msgstr "Assigna un o tots els jugadors IA a 'trampós'." #: server/commands.c:390 msgid "" @@ -33271,7 +33260,7 @@ #: server/commands.c:399 msgid "Set one or all AI players to 'experimental'." -msgstr "Estableix un o tots el jugadors a 'experimental'." +msgstr "Estableix un o tots els jugadors a 'experimental'." #: server/commands.c:400 msgid "" @@ -34398,32 +34387,32 @@ msgid "Your %s was captured after completing the mission." msgstr "El teu %s ha estat capturat després d'acomplir la seva missió." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Has provocat un incident en subornar el %2$s %1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s ha causat un incident en subornar els teus %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Has causat un incident en intentar robar tecnologia de %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s ha causat un incident en intentar robar-te tecnologia." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Has causat un incident en incitar una revolta a %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "Els %s han causat un incident en incitar una revolta a %s." @@ -34799,19 +34788,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "El temps màxim per torn no pot ser negatiu, el poso a zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "El servidor no ha pogut reservar posicions d'inici." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Massa de terra gran - pot trigar uns segons." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "El generador 3 no ha situat totes les illes grans." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "El generador 3 ha deixat massa de terra %li sense situar." @@ -34997,12 +34986,12 @@ "Els treballadors s'apleguen espontàniament i milloren totes les ciutats " "possibles amb bases millors." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "S'ha mogut el teu %s degut a un canvi de terreny." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Desmobilitzat el teu %s degut a un canvi de terreny." @@ -35681,8 +35670,8 @@ "partides desades antigues o pot indicar que el fitxer desat no és correcte. " "Continua coneixent el risc." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s s'ha afegit com a jugador de nivell %s controlat per IA (%s)." @@ -38552,7 +38541,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "L'alto el foc amb %s s'ha acabat. Ara estàs en guerra amb els %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"S'ha acabat l'alto el foc entre %s i %s. Estan en guerra. Cancel·les la teva " +"aliança amb %s." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38561,53 +38559,53 @@ "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:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Parts de la nau especial col·locades automàticament que encara no estaven al " "seu lloc." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Tipus de compressió no suportat %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "No s'ha pogut desar la partida com a %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Partida desada com a %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "La partida ja s'està jugant." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "S'està iniciant la partida." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "sol·licitud d'informe desconegut (tipus %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Avís: rebutjant client antic %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38615,53 +38613,53 @@ "El teu client és massa antic. Per utilitzar aquest servidor actualitza si us " "plau el teu client a Freeciv 2.2 o posterior." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "No tens permís per editar." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "La nació %s no està disponible per als usuaris." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "La nació %s ja està agafada." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s és el dirigent %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "s'han demanat més jugadors que 'maxplayers'" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "no hi ha prou nacions jugables en aquest joc de nacions (vegeu l'opció " "'nationset')" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "no hi ha prou nacions jugables" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s governa els %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -38669,36 +38667,36 @@ "Aquest programa freeciv-server té suport d'autenticació de jugadors, però " "ara mateix no es fa servir." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "S'està enviant informació al metaservidor <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" "No es comença sense connexió de metaservidor sol·licitada explícitament." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "La partida ha acabat..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "No s'ha pogut crear un mapa apropiat, es torna a provar amb una altra llavor " "de mapa" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "No es pot crear un mapa adequat amb els paràmetres donats." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "L'opció '%s' s'ha modificat de %s a %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "S'estan acceptant noves connexions de clients al port %d." @@ -40561,17 +40559,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "Els %s aconsegueixen %s com a resultat d'haver après %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "Producció de ciència massa baixa. Hem perdut Tecnologia del Futur %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Producció de ciència insuficient. Hem perdut %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -40580,7 +40578,7 @@ "La tecnologia requerida per al nostre govern '%s' s'ha perdut. Els ciutadans " "han començat una revolució per obtenir '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -40589,32 +40587,32 @@ "La tecnologia requerida per al nostre nou govern '%s' s'ha perdut. Els " "ciutadans trien '%s' com a nou objectiu de govern." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s no pot construir %s. La tecnologia requerida s'ha perdut." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "L'objectiu tecnològic és %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Robes %s dels %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Els %s et roben %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Els %s han robat %s dels %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -41542,6 +41540,18 @@ msgid "error %d (compiled without strerror)" msgstr "error %d (compilat sense strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), client %s" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Client Qt, %s%s (%s)" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s encara no pot construir %s." + #~ msgid "LAN" #~ msgstr "LAN" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/cs.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/cs.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/cs.po freeciv-2.5.8/translations/freeciv/cs.po --- freeciv-2.5.7/translations/freeciv/cs.po 2017-05-13 12:07:45.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/cs.po 2017-08-12 11:54:31.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: freeciv 2.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-01-21 15:42+0100\n" "Last-Translator: Dusan Hokuv \n" "Language-Team: Czech \n" @@ -316,12 +316,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s přerušili stavbu %s ve městě %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s zahájili stavbu %s ve městě %s." @@ -354,7 +354,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -760,13 +760,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1896,10 +1896,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Vlajka" @@ -2649,7 +2649,7 @@ msgstr "Jaký národ chcete vést?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Vyberte národ" @@ -3323,16 +3323,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Jméno" @@ -3447,11 +3447,11 @@ msgstr "Národy" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Typ" @@ -3618,9 +3618,9 @@ msgid "Seen (Invis)" msgstr "Naposledy viděn" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Neznámý" @@ -3744,7 +3744,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Chyby hlašte na <%s>.\n" @@ -3768,7 +3768,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4148,12 +4148,12 @@ msgid "Load Lua Script" msgstr "_Naložit jednotku" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Založit nové město" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4185,8 +4185,8 @@ msgid "Set local options" msgstr "Nastavení lokálních možností" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Nastavení hry" @@ -4597,8 +4597,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Start s_cénáře" @@ -4996,7 +4996,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Tento příkaz je pouze pro klienta." @@ -5007,7 +5007,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5015,384 +5015,377 @@ "%s client" msgstr "Tento příkaz je pouze pro klienta." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Tento příkaz je pouze pro klienta." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Start _nové hry" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Start s_cénáře" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Nahrát u_loženou hru" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Přip_ojit k síťové hře" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Připojit do Herní _Zóny" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Vyberte si umístění pro uložení" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Procházet..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Hesla nesouhlasí, zadejte heslo." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Jméno serveru" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Verze" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Stav" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Hráči" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Člověk" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Komentář" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lo_kální síť" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "He_slo:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Heslo z_novu:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Přip_ojit" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Název připojení: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Jméno hráče: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 #, fuzzy msgid "Player/conn info" msgstr " -v, --version vytisknout informace o verzi\n" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 #, fuzzy msgid "Toggle player ready" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Vyberte národ" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Pozorovat tohoto hráče" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 #, fuzzy msgid "Take this player" msgstr "Města" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 #, fuzzy msgid "Cut connection" msgstr "Ruším spojení s %s." -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 #, fuzzy msgid "Aitoggle player" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 #, fuzzy msgid "Remove player" msgstr "Odstraňuji hráče %s." #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Nemohu přistupovat ke složce `%s': %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, fuzzy, c-format msgid "Put on %s" msgstr "Populace: %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 #, fuzzy msgid "Not _ready" msgstr ", nepřipraven" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Připraven" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Dlaždice %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Vyberte _národ" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Města" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Pozorovatel: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 #, fuzzy msgid "_Observe" msgstr "_Pozorovatel" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "nyní _pozoruje" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s PO>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Náhodný" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Pozorovatel" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 #, fuzzy msgid "Detached" msgstr "Mrtvý" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Počet hráčů (včetně počítačových):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "Úroveň počítačem ovládaných hráčů:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Poušť" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Více M_ožností Hry..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Záznam" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 #, fuzzy msgid "Rating" msgstr "čekání" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Připraven" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?Player:Jméno" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Tým" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Vyberte uloženou hru pro nahrání" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Vyberte uloženou hru pro _nahrání:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Vyberte scénář" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Vyberte _scénář:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Uložit _soubor:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Uložit hru" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Uložené _hry:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Uložit _soubor:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Start s_cénáře" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Start s_cénáře" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Uložit hru" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Uložené _hry:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Uložené _hry:" @@ -5939,7 +5932,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "He_slo:" @@ -5979,7 +5972,7 @@ msgstr "Nové domovské město" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Naložit" @@ -6256,8 +6249,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6447,7 +6440,7 @@ msgstr[1] "Opravdu to chcete ukončit?" msgstr[2] "Opravdu to chcete ukončit?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6463,7 +6456,7 @@ msgid "Yes" msgstr "Ano" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6552,13 +6545,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Klient pro Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "nyní _pozoruje" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Pozorovatel" @@ -6592,7 +6585,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Konec" @@ -6769,9 +6762,9 @@ msgid "Game" msgstr "Hra" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Možnosti" @@ -6800,8 +6793,8 @@ msgid "Leave game" msgstr "Uložit hru" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7089,7 +7082,7 @@ msgstr "Hodnota daní..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7142,7 +7135,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Obnovit" @@ -7153,143 +7146,137 @@ msgstr "Použít jednou" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Tento příkaz je pouze pro klienta." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Jednotka: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Tento příkaz je pouze pro klienta." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Tento příkaz je pouze pro klienta." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Start nové hry" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Start s_cénáře" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Nahrát uloženou hru" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Přip_ojit k síťové hře" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Připojit" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Login:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Heslo:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Heslo z_novu:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Globální Pozorovatel" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Procházet..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Start s_cénáře" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Vůdce:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Odpojit" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Města" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Uložit _soubor:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Start s_cénáře" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Start s_cénáře" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Globální Pozorovatel" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr ", nepřipraven" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", úroveň obtížnosti %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Populace: %s" @@ -7401,7 +7388,7 @@ msgid "Back" msgstr "Zpět" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Nahrát hru" @@ -8577,47 +8564,41 @@ msgstr "Přejmenovat seznam prací" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv verze %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Tento příkaz je pouze pro klienta." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Start nové hry" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "Přihlašovací jméno" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " (pozorovatel)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 #, fuzzy msgid "Join LAN Server" msgstr "LAN servery" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL Klient vás vítá..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Město: %s" @@ -15649,83 +15630,83 @@ msgid "?unitflag:Hunter" msgstr "Helikoptéra" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv verze %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta verze)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv verze %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv verze %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "testovací beta verze " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "verze " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Lednu" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Únoru" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Březnu" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Dubnu" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Květnu" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Červnu" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Červenci" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Srpnu" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Září" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Říjnu" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Listopadu" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Prosinci" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15734,7 +15715,7 @@ "TOTO JE BETA VERZE\n" "Freeciv %s vyjde v %s, na %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15743,7 +15724,7 @@ "TOTO JE BETA VERZE\n" "Freeciv %s vyjde v %s, na %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Aby civilizace byla svobodná!" @@ -16630,61 +16611,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Evropský" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klasický" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropický" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Asijský" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babylónský" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Keltský" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renesanční" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Průmyslový" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Moderní" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:PostModerní" @@ -18429,18 +18410,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "zelenáč" @@ -19109,14 +19090,14 @@ "začali stavět div světa a dokončit jej tak za jediný tah!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Vůdce barbarů" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20992,9 +20973,9 @@ "territory." msgstr "Průzkumníci jsou velice užiteční při mapování neznámého území." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21405,8 +21386,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:Keltský" @@ -21823,13 +21804,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "To jste Vy. Pokud ztratíte tuto jednotku, prohrajete hru. " -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Toto mohou stavět jen barbaři.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29386,20 +29373,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Neznámý" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29454,12 +29441,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Vyberte technologii pro krádež" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "Jednotka %s byla úspěšně transportována." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29491,14 +29478,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Opravdu to chcete ukončit?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29507,60 +29494,60 @@ msgid "Failed to start downloader" msgstr "Selhalo vytvoření nového hráče %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Vyberte technologii pro krádež" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Vyberte technologii pro krádež" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Vyberte technologii pro krádež" @@ -29847,82 +29834,82 @@ msgid "A poorly-named city" msgstr "Špatně pojmenované město" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Domovské město jednotky %s změněno na %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "přesunuta %s v %s z %s do %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s patřící %s převedena na %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s ztracena při útoku %s %s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s ztraceno spolu s kontrolou %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Náhrada %s byla postavena v %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Již jsme měli město pojmenované %s. Město bylo přejmenováno na %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Lidé ve městě %s jsou ohromeni vaším technologickým postupem!\n" " Dělníci spontáně vylepšili město stavbou železnice." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, fuzzy, c-format msgid "You have founded %s." msgstr "Založili jsme město %s" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Jednotka %s opustila zrušené město %s, aby neuvízla na souši." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -29930,7 +29917,7 @@ "Protože byla jednotka %s rozpuštěna, byla ztracena jednotka %s, protože se " "nemohla dostat ven." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -29938,17 +29925,17 @@ "Protože byla jednotka %s rozpuštěna, byla ztracena jednotka %s, protože se " "nemohla dostat ven." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Úplně jsme zničili %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Město %s bylo zcela zničeno hráčem %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, fuzzy, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -29956,7 +29943,7 @@ msgstr[1] "Dobyl(a) jste město %s, Vaše kořist činí %d zlatých!" msgstr[2] "Dobyl(a) jste město %s, Vaše kořist činí %d zlatých!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, fuzzy, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -29964,17 +29951,17 @@ msgstr[1] "Hráč %s dobyl město %s a ukořistil v něm %d zlatých." msgstr[2] "Hráč %s dobyl město %s a ukořistil v něm %d zlatých." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Při atomovém útoku jste ozářil(a) město %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, fuzzy, c-format msgid "%s conquered %s." msgstr "%s se připojil z %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, fuzzy, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -29982,7 +29969,7 @@ msgstr[1] "Dobyli jsme město %s! Naše kořist činí %d zlatých!" msgstr[2] "Dobyli jsme město %s! Naše kořist činí %d zlatých!" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, fuzzy, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -29990,54 +29977,54 @@ msgstr[1] "Hráč %s osvobodil město %s a ukořistil v něm %d zlatých." msgstr[2] "Hráč %s osvobodil město %s a ukořistil v něm %d zlatých." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, fuzzy, c-format msgid "You have liberated %s!" msgstr "Založili jsme město %s" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, fuzzy, c-format msgid "%s liberated %s." msgstr "%s vládne %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Lituji, %s zrušil obchodní cestu z %s do Vašeho města %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Lituji, %s zrušil obchodní cestu z %s do Vašeho města %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " podle seznamu prací" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s staví %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -30045,17 +30032,17 @@ msgstr[1] "Prodal(a) jste %s v %s (nyní ve vnitrozemí) za %d zlatých." msgstr[2] "Prodal(a) jste %s v %s (nyní ve vnitrozemí) za %d zlatých." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%s %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Letiště" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30339,20 +30326,21 @@ msgid "The %s have started building a spaceship!" msgstr "%s začali se stavbou vesmírn lodi!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "Město %s zatím nemůže postavit %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Může stavět nová města.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "Město %s dokončilo stavbu %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -30360,77 +30348,77 @@ msgstr[1] "" msgstr[2] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Nadále nelze udržovat %s ve městě %s - stavba prodána!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Nedostatek zlata. %s zrušeni." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Znečištění poblíž města %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "%s řekl vaši přezdívku v %s" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Oslavy zrušeny v %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Občanské nepokoje ve městě %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "OBČANSKÉ NEPOKOJE POKRAČUJÍ ve městě %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Pořádek obnoven ve městě %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Lidé svrhli Vaší %s - země upadla do zmatku." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s nemůže ještě postavit %s, protože nesmíme rozpustit naše jediné město." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "Město %s je zrušeno a z jeho obyvatel jsou jednotky %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30438,7 +30426,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30446,91 +30434,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "Město %s je zrušeno a z jeho obyvatel jsou jednotky %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "Na %s podnikli %s jaderný útok!" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Znečištění poblíž města %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Hladomor ve městě %s vedl ke ztrátě obyvatel." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s zničili %s ve městě %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Váš %s zničil %s ve městě %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Stavba %s byla změněna na %s ve městě %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32376,32 +32364,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Váš %s byl zajat poté, co dokončil svoji misi." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Váš pokus o uplacení %2$s hráče %1$s vyvolal incident." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "Hráč %s vyvolal incident svým pokusem o uplacení Vašeho %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, fuzzy, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Při pokusu o krádež technologie hráči %s došlo k incidentu." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, fuzzy, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "Hráč %s vyvolal incident svým pokusem o krádež technologie." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Způsobil jste incident při pokusu vyvolat povstání ve městě %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s způsobil incident při pokusu vyvolat povstání ve městě %s." @@ -32729,19 +32717,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Čas na jedno kolo je menší než nula, upraveno na nulu." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 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:2472 +#: server/generator/mapgen.c:2473 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:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generátor 3 nezozmístil %li pevniny." @@ -32920,12 +32908,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Přesunuta naše %s kvůli změně moře na pobřeží." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Rozpuštěna naše %s kvůli změně moře na pobřeží." @@ -33614,8 +33602,8 @@ "Uložená hra obsahuje neúplná data mapy. Může se jednat o starší verzi " "souboru nebo o neplatný soubor. Pokračujte na vlastní nebezpečí." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s byl přidán jako počítačem ovládaný hráč úrovně %s." @@ -36276,7 +36264,15 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Příměří s %s skončilo. K %s jste nyní neutrální." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Váš týmový spoluhráč %s vyhlásil válku %s. Jsme povinni zrušit alianci s %s." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36284,49 +36280,49 @@ msgstr "" "Váš týmový spoluhráč %s vyhlásil válku %s. Jsme povinni zrušit alianci s %s." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "Nepodporovaný typ komprese %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Nepodařilo se uložit hru jako %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Hra uložena jako %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Hra již probíhá." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Zahajuji hru." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "požadavek pro neznámé hlášení (typ %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Upozornění: odmítnut starý klient %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -36334,83 +36330,83 @@ "Váš klient je příliš starý. Pro použití tohoto serveru, prosím aktualizujte " "klienta na Freeciv 2.2 nebo novější." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Nemáte povoleno upravovat." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s národ není dostupný v tomto scénáři." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s národ je již použit." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s je %s vládce %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "Redukuje se aifill, protože není dostatek hratelných národů." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s vládne %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Posílá se info metaserveru <%s>" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Hra je u konce..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Nelze vytvořit město na (%d, %d), protože to není na mapě!" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Volba: %s byla nastavena na \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Nyní přijímám spojení od klientů." @@ -38264,56 +38260,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Zvyšuje vědecké zdroje ve městě o 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, fuzzy, c-format msgid "Technology goal is %s." msgstr "Ve městě %s nebyla nalezena žádná nová technologie." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, fuzzy, c-format msgid "You steal %s from the %s." msgstr "%s získali %s od %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s nám ukradli %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, fuzzy, c-format msgid "The %s have stolen %s from the %s." msgstr "%s získali %s od %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39246,6 +39242,21 @@ msgstr "chyba %d (přeloženo bez strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Tento příkaz je pouze pro klienta." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Tento příkaz je pouze pro klienta." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv verze %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "Město %s zatím nemůže postavit %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/da.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/da.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/da.po freeciv-2.5.8/translations/freeciv/da.po --- freeciv-2.5.7/translations/freeciv/da.po 2017-05-13 12:07:47.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/da.po 2017-08-12 11:54:32.000000000 +0000 @@ -45,7 +45,7 @@ msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-01-30 14:56+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -381,12 +381,12 @@ "*%s (AI)* Vi er under fuld angreb fra %s, og behøver din hjælp! Leve vores " "alliance og dit navn vil aldrig blive glemt!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s har stoppet bygningen af %s i %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s har startet bygningen af %s i %s." @@ -420,7 +420,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -818,13 +818,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1961,10 +1961,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flag" @@ -2685,7 +2685,7 @@ msgstr "Hvilken nation vil du være?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Vælg nation" @@ -3345,16 +3345,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Navn" @@ -3465,11 +3465,11 @@ msgstr "Nationer" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Type" @@ -3642,9 +3642,9 @@ msgid "Seen (Invis)" msgstr "Set (Usyn)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Ukendt" @@ -3765,7 +3765,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Rapporter fejl til %s\n" @@ -3789,7 +3789,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Oversigt" @@ -4163,12 +4163,12 @@ msgid "Load Lua Script" msgstr "_Læs enhed" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Byg ny by" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4200,8 +4200,8 @@ msgid "Set local options" msgstr "Lokale indstillinger" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Spilindstillinger" @@ -4591,8 +4591,8 @@ msgid "Game/Scenario Properties" msgstr "Spil-/scenariegenskaber" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Gem scenarie" @@ -4955,7 +4955,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Denne kommando er for klienter kun." @@ -4966,7 +4966,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4974,369 +4974,362 @@ "%s client" msgstr "Denne kommando er for klienter kun." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Denne kommando er for klienter kun." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Start _nyt spil" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Start nyt _scenarie" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Indlæs gemt spil" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Tilslut til netværksspil" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Tilslut til _netværksspil" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Vælg placering hvor du vil gemme" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Gennemse..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Adgangskoder passer ikke, indtast adgangskode." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servernavn" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Version" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Spillere" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Menneske" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Kommentar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lok_alnetværk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Metaserver på internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Vært:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Bruger:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Adgangsk_ode:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Bekr_æft adgangskode:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Vært" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Tilsl_ut" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Forbindelsesnavn: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Spillernavn: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Server: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Spiller/forb-info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Skift mellem klar/ikke klar" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Vælg nation" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observer denne spiller" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Benyt denne spiller" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Afbryd tilslutning" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Slå AI til/fra for spiller" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Fjern spiller" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Giv %s-adgang" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Brug %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Ikke kla_r" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Klargør alle" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Overtag %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Vælg _nation" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Overtag en spiller" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Observér %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observer" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Undlad at _observere" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s computer>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Tilfældig" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observatør" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Aftaget" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Antal spillere (inklusive AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_AI-niveau:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Nulstil" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Flere spilindstillinger..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Optag" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rater" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Klar" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:leder" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Hold" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Vælg gemt spil at indlæse" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Vælg gemt spil til ind_læsning:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Vælg et scenarie" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Vælg et _scenarie:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Filnavn:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Gem spil" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Gemte spil:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Gem _filnavn:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Gem scenarie" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Gem scenarie" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Gem spil" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Gemte spil:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Gemte spil:" @@ -5868,7 +5861,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Yderligere information kan findes ved at venstreklikke på borgerne." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Adgangsk_ode:" @@ -5909,7 +5902,7 @@ msgstr "Gør til ny hjemby" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Last" @@ -6184,8 +6177,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6374,7 +6367,7 @@ msgstr[0] "Er du sikker på, at du vil slutte?" msgstr[1] "Er du sikker på, at du vil slutte?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6390,7 +6383,7 @@ msgid "Yes" msgstr "Ja" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6478,13 +6471,13 @@ msgid "This is Qt-client for Freeciv." msgstr "SDL-klient til Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Undlad at _observere" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Observer" @@ -6518,7 +6511,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Afslut" @@ -6687,9 +6680,9 @@ msgid "Game" msgstr "Spil" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Indstillinger" @@ -6718,8 +6711,8 @@ msgid "Leave game" msgstr "Forlad spil" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6998,7 +6991,7 @@ msgstr "Skatteniveau..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7050,7 +7043,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Opfrisk" @@ -7061,143 +7054,137 @@ msgstr "Benyt en gang" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Denne kommando er for klienter kun." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Enhed: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Denne kommando er for klienter kun." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Denne kommando er for klienter kun." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Start nyt spil" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Start nyt _scenarie" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Indlæs gemt spil" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Tilslut til netværksspil" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Tilslut" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Bruger:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Adgangskode:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Bekr_æft adgangskode:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_Metaserver på internet" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Global observatør" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Gennemse..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Gem scenarie" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Leder:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Afbryd forbindelse" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Gem spillere" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Gem _filnavn:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Scenarienavn" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Scenarienavn" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Global observatør" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Ikke kla_r" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", sværhedsgrad %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Brug %s" @@ -7309,7 +7296,7 @@ msgid "Back" msgstr "Tilbage" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Fortsæt et spil" @@ -8461,44 +8448,38 @@ msgstr "Tilføj ny arbejdsliste" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv version %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Denne kommando er for klienter kun." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Start nyt spil" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Slut til spil" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Slut til pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Slut til LAN-server" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient ønsker dig velkommen..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "By: %s" @@ -15503,83 +15484,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv version %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(betaversion)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv version %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv version %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "betatest version " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "version " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Januar" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februar" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Marts" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "April" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Maj" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "August" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "September" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "December" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15588,7 +15569,7 @@ "DETTE ER EN BETAVERSION\n" "Freeciv %s vil snart blive udgivet i %s, på %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15597,7 +15578,7 @@ "DETTE ER EN BETAVERSION\n" "Freeciv %s vil snart blive udgivet i %s, på %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Fordi kultur bør være frit tilgængelig!" @@ -16489,61 +16470,61 @@ msgstr "" "Hver skatteopkræver producerer to ekstra guld til din statskasse hver tur." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Europæisk" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klassisk" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropisk" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Asiatisk" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babylonisk" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Keltisk" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renæssance" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Industriel" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Moderne" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Postmoderne" @@ -18336,18 +18317,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "grøn" @@ -19113,14 +19094,14 @@ "vidunderet færdiggøres på kun en tur!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarleder" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21066,9 +21047,9 @@ "Udforskere er modige personer som er nyttige til at kortlægge ukendt " "territorium." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21480,8 +21461,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "Hver skatteindsamler giver tre ekstra guld til din statskasse per tur." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "?citystyle:Elektronikalder" @@ -21935,13 +21916,19 @@ msgstr "" "Dette er dig. hvis du mister denne enhed, taber du spillet. Så undgå det." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Kun barbarer kan bygge denne.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30691,20 +30678,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Ukendt" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -30759,12 +30746,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Vælg tilføjelsespakke som skal installeres" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s blev transporteret uskadt frem." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -30799,14 +30786,14 @@ msgid "Automatically install modpack from a given URL" msgstr "Kunne ikke hente kontrolfil til tilføjelsespakke fra den givne adresse" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Er du sikker på, at du vil slutte?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Der hentes allerede noget" @@ -30814,61 +30801,61 @@ msgid "Failed to start downloader" msgstr "Kunne ikke starte hentefunktion" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 #, fuzzy msgid "Installed" msgstr "Installér tilføjelsespakke" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 #, fuzzy msgid "?modpack:Type" msgstr "Installér tilføjelsespakke" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Installér tilføjelsespakke" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Adresse for tilføjelsespakke" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Vælg tilføjelsespakke som skal installeres" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Vælg tilføjelsespakke som skal installeres" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Vælg tilføjelsespakke som skal installeres" @@ -31148,208 +31135,208 @@ msgid "A poorly-named city" msgstr "En dårligt navngivet by" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Ændret hjemby for %s til %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Overførte %s i %s fra %s til %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Overførte %s fra %s til %s." # problem #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s gik tabt i transit til %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "En enhed (%s) gik tabt sammen med kontrollen over %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "En/et erstatnings%s blev bygget i %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Du har allerede en by som hedder %s. Byen blev omdøbt til %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Folket i %s forbløffes over din teknologiske indsigt!\n" " Arbejderne samler sig til dåd og bygger jernbaner i byen." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Du har grundlagt %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Flyttede %s ud af forladt by %s for at undgå at blive låst fast på %s." # din udeladt for at undgå tvivl om din/dit -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Da %s blev opløst kunne %s ikke flygte og gik derfor tabt." # din udeladt for at undgå tvivl om din/dit -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "Da %s blev opløst kunne %s ikke flygte og gik derfor tabt." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Du tilintetgør %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s er blevet tilintetgjort af %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Du erobrer %s; plyndringerne beløber sig til %d guld!" msgstr[1] "Du erobrer %s; plyndringerne beløber sig til %d guld!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s erobrede %s og plyndrede %d guld fra byen." msgstr[1] "%s erobrede %s og plyndrede %d guld fra byen." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Du erobrer %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s erobrede %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Du har befriet %s! Plyndringerne beløber sig til %d guld." msgstr[1] "Du har befriet %s! Plyndringerne beløber sig til %d guld." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s befriede %s og plyndrede %d guld fra byen." msgstr[1] "%s befriede %s og plyndrede %d guld fra byen." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Du har befriet %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s befriede %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Handelsrute mellem %s og %s afbrudt." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Handelsrute mellem %s og %s afbrudt." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Beklager, %s har afbrudt handelsruten fra %s til din by %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Beklager, %s har afbrudt handelsruten fra %s til din by %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " fra arbejdslisten" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s bygger nu %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Du sælger %s i %s (nu uden havn) for %d guld." msgstr[1] "Du sælger %s i %s (nu uden havn) for %d guld." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Størrelsen af bykortet for %s er %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "øget" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "reduceret" @@ -31630,89 +31617,90 @@ msgid "The %s have started building a spaceship!" msgstr "Folkeslaget %s har startet bygningen af et rumskib!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s kan ikke bygge %s endnu." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Kan bygge nye byer.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "Byen %s har fuldført %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, fuzzy, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s koster %d befolkning. %s mindskes til størrelse %d." msgstr[1] "%s koster %d befolkning. %s mindskes til størrelse %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Har ikke råd til at opretholde %s i %s, bygning solgt!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Ikke nok guld. %s opløst." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Forurening nær %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Festligheder afholdes til din ære i %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Festlighederne i %s er afbrudt." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s er ramt af pest! Befolkning er gået til!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Uroligheder i %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "UROLIGHEDERNE FORTSÆTTER i %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Lov og orden er genindført i %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Folket har forkastet din ledelse som %s. Hele landet er i oprør." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s kan ikke bygge %s endnu, og vi kan ikke forlade vor eneste by." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s er opløst i %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31720,7 +31708,7 @@ "Udvandrere fra %s kan ikke gå til %s, da der ikke er nok mad tilgængelig!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31730,7 +31718,7 @@ "tilgængelig!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31740,7 +31728,7 @@ "tilgængelig!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31749,7 +31737,7 @@ "vokse!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31758,7 +31746,7 @@ "at vokse!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -31766,73 +31754,73 @@ "Udvandrere fra %s (%s) kan ikke gå til %s, da den behøver en forbedring for " "at vokse!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s blev opløst af sine indbyggere." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Udvandrere fra %s flyttede til %s i jagten på et bedre liv." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Udvandrere fra %s flyttede til %s (%s) i jagten på et bedre liv." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Udvandrere fra %s (%s) flyttede til %s i jagten på et bedre liv." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s blev udsat for atomangreb fra %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Forurening nær %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Hungersnød fører til befolkningstab i %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s ødelagde %s i %s." # %s er diplomat/spion, derfor o.k. #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Din %s ødelagde %s i %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Produktion af %s er opgraderet til %s i %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" "Indbyggerne i %s tænker på at udvandre til %s for at skabe dem et bedre liv." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33747,32 +33735,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Din %s blev fanget efter at have fuldført sin mission." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Du har forårsaget en skandale ved at bestikke %s's %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s har forårsaget en skandale ved at bestikke din %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Du har forårsaget en skandale ved teknologityveriet fra %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s har forårsaget en skandale ved at stjæle teknologi fra dig." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Du har forårsaget en skandale ved at anspore til oprør i %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s har forårsaget en skandale ved at anspore til oprør i %s." @@ -34134,19 +34122,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Rundens tidsfrist er mindre end nul, sætter den til nul." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Stor landmasse - dette kan tage nogen sekunder." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 placerede ikke alle de store øer." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 efterlod %li landmasse uplaceret." @@ -34332,12 +34320,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Flyttede din %s på grund af ændret terræn." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Opløste din %s på grund af ændret terræn." @@ -35007,8 +34995,8 @@ "Det gemte spil ufuldstændige kortdata. Dette kan ske med gamle gemte spil, " "eller det kan tyde på fejl ved selve filen. Fortsæt på eget ansvar." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s er blevet tilføjet som %s niveau AI-kontrolleret spiller." @@ -37784,7 +37772,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Våbenhvilen med %s er udløbet. Du er nu i krig med %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Våbenhvilen mellem %s og %s er udløbet. De er i krig. Du annullerer " +"alliancen med begge." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -37793,50 +37790,50 @@ "Våbenhvilen mellem %s og %s er udløbet. De er i krig. Du annullerer " "alliancen med begge." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Komprimeringstypen %d understøttes ikke." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Kunne ikke gemme spil som %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Spil gemt som %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Spillet er allerede i gang." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Starter spil." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "ukendt rapport (type %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Advarsel: Afviser ældre klient %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -37844,51 +37841,51 @@ "Din klient er for gammel. For at anvende denne server skal du opgradere din " "klient til Freeciv 2.2 eller senere." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Du har ikke tilladelse til at redigere." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s nation er ikke tilgængelig i dette scenarie." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Nationen %s er allerede i brug." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s er %s hersker %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" # er aifill en kommando? -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "Reducerer aifill da der ikke er nok nationer der kan spilles som." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s styrer %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -37896,35 +37893,35 @@ "Dette freeciv-server-program understøtter spillergodkendelse, men dette er i " "øjeblikket ikke i brug." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Sender info til metaserver <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Starter ikke uden den præcist anmodede metaserverforbindelse." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Spillet er forbi..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "" "Kan ikke oprette en enhed på %s da den angivne enhedstype-id %d er ugyldig." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Indstilling: %s er blevet sat til %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Accepterer nu nye klient-tilslutninger." @@ -39757,17 +39754,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "Utilstrækkelig forskning. Vi mistede fremtidsteknologi %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Utilstrækkelig forskning. Vi mistede %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -39776,7 +39773,7 @@ "Den påkrævede teknologi for vores styreform, \"%s\", gik tabt. Borgerne har " "startet en revolution på vej til \"%s\"." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -39785,33 +39782,33 @@ "Den påkrævede teknologi for vores nye styreform, \"%s\", gik tabt. Borgerne " "har valgt \"%s\" som ny målstyreform." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s kan ikke bygge %s. Den krævede teknologi gik tabt." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Det teknologiske mål er %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Du stjæler %s fra %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Folkeslaget %s stjal %s fra dig!" # Eksempel: "Danskerne stjal Skrivekunst fra Svenskerne" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s stjal %s fra %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -40724,6 +40721,21 @@ msgid "error %d (compiled without strerror)" msgstr "fejl %d (oversat uden strerror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Denne kommando er for klienter kun." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Denne kommando er for klienter kun." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv version %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s kan ikke bygge %s endnu." + # problem #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/de.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/de.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/de.po freeciv-2.5.8/translations/freeciv/de.po --- freeciv-2.5.7/translations/freeciv/de.po 2017-05-13 12:07:47.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/de.po 2017-08-12 11:54:32.000000000 +0000 @@ -70,7 +70,7 @@ msgstr "" "Project-Id-Version: 1.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-11-16 23:36+0100\n" "Last-Translator: Marvin Gülker \n" "Language-Team: German Freeciv Translators \n" @@ -421,12 +421,12 @@ "Hilfe! Ehren Sie unsere ruhmreiche Allianz und Ihr Name wird niemals " "vergessen werden!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Die %s haben aufgehört, %s in %s zu bauen." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Die %s haben begonnen, %s in %s zu bauen." @@ -463,7 +463,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -863,13 +863,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1976,10 +1976,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flagge" @@ -2707,7 +2707,7 @@ msgstr "Wählen Sie eine Nation!" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Wähle Nation" @@ -3368,16 +3368,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Name" @@ -3488,11 +3488,11 @@ msgstr "Nationen" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Bild" @@ -3668,9 +3668,9 @@ msgid "Seen (Invis)" msgstr "Gesehen (Unsicht.)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Unbekannt" @@ -3793,7 +3793,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "" @@ -3823,7 +3823,7 @@ # MG: Gemeint ist der Kartentab. #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Karte" @@ -4194,12 +4194,12 @@ msgid "Load Lua Script" msgstr "Lua-Skript laden" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Neue Stadt gründen" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4230,8 +4230,8 @@ msgid "Set local options" msgstr "Client konfigurieren" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Spieleinstellungen" @@ -4606,8 +4606,8 @@ msgid "Game/Scenario Properties" msgstr "Spiel-/Szenarieneigenschaften" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Szenario speichern" @@ -4966,7 +4966,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, %s-Klient." @@ -4977,7 +4977,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4988,267 +4988,260 @@ "Commit: %s\n" "%s-Klient" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), %s-Klient." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Neues Spiel beginnen" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "_Szenariospiel beginnen" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Gespeichertes Spiel _laden" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Mit Netzwerkspiel _verbinden" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Mit Gaming _Zone verbinden" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Verzeichnis auswählen zum Speichern" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Durchsuchen..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Keine Übereinstimmung, Passwort eingeben." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Server" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Version" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Spieler" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "menschlich" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Kommentar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lokales _Netzwerk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Server:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Name:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Passwort:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Passwort _wiederholen:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Server" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Verbinden" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Verbindungsname: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Spielername: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Server: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Spieler/Verbindungsinfo" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s Info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Spieler bereit / nicht bereit" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Wähle Nation" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Diesen Spieler beobachten" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Spieler übernehmen" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Verbindung trennen" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "KI ein/ausschalten" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Spieler entfernen" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Berechtige Zugriff: %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Zu %s hinzugefügt" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Nicht _bereit" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Bereit" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "%s überne_hmen" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Wähle _Nation" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Spieler übernehmen" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "%s _beobachten" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "Be_obachten" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Nicht be_obachten" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s KI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Zufällig" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Beobachter" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Nicht verbunden" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5256,95 +5249,95 @@ "An_zahl der Spieler\n" "(einschließlich KI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_KI Stärke:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Regelsatz:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Weitere Spiel_optionen..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Rekord" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Bewertung" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Bereit" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Spieler" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Team" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Wähle zu ladendes Spiel" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Wähle zu _ladendes Spiel:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Szenario laden" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "_Szenario laden:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Dateiname:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Spiel speichern" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Gespeicherte Spiele:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "_Speichere Datei:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Gespeicherte Sze_narien:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "S_zenario speichern:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Kartenbild speichern" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Gespeicherte Kartenb_ilder:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "_Kartenbilder speichern:" @@ -5868,7 +5861,7 @@ msgstr "" "Weitere Informationen sind über einen%sLinksklick auf die Bürger verfügbar." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Neues Pass_wort:" @@ -5905,7 +5898,7 @@ msgstr "Standort als neue Heimatstadt wählen" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Einschiffen" @@ -6143,8 +6136,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6320,7 +6313,7 @@ msgstr[0] "Wollen Sie wirklich %1 Einheit auflösen?" msgstr[1] "Wollen Sie wirklich %1 Einheiten auflösen?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6336,7 +6329,7 @@ msgid "Yes" msgstr "Ja" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6423,12 +6416,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Dies ist der Qt-Klient für Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Nicht beobachten" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Beobachten" @@ -6462,7 +6455,7 @@ "nach '--'. Siehe die Qt-Dokumentation.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Beenden?" @@ -6613,9 +6606,9 @@ msgid "Game" msgstr "Spiel" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Optionen" @@ -6640,8 +6633,8 @@ msgid "Leave game" msgstr "Spiel verlassen" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6900,7 +6893,7 @@ msgstr "Steuern..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Spieler" @@ -6948,7 +6941,7 @@ msgid "... read more in help" msgstr "…mehr dazu in der Hilfe" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Neu laden" @@ -6958,123 +6951,117 @@ msgstr "Anwenden" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, Qt-Klient." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "Commit: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Qt-Klient." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), Qt-Klient." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Neues Spiel beginnen" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Szenariospiel beginnen" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Gespeichertes Spiel laden" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Mit Netzwerkspiel verbinden" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Verbinden" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Nutzername:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Passwort" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Passwort wiederholen:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Internet-Server:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Lokale Server:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Datum" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Durchsuchen..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Szenario laden" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Anführer:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Verbindung trennen" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Spielstände" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Spielstand laden" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Szenarien" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Szenario laden" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Globale Beobachter" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Nicht bereit" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Schwierigkeitsgrad festlegen" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Zum Team hinzufügen" @@ -7178,7 +7165,7 @@ msgid "Back" msgstr "Zurück" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Spiel laden" @@ -8314,44 +8301,38 @@ msgstr "Neue Arbeitsliste" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv Version %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "%s-Klient." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Neues Spiel beginnen" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "An einem Spiel teilnehmen" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Verbinde mit öffentlichem Server" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Verbinde mit LAN Server" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient heißt Dich willkommen ..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Commit: %s" @@ -15429,83 +15410,83 @@ msgid "?unitflag:Hunter" msgstr "Jäger" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv Version %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(Beta-Version)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv Version %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv Version %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "Betatest-Version" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "Version " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Januar" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februar" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "März" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "April" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mai" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "August" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "September" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Dezember" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15514,7 +15495,7 @@ "DIES IST EINE BETA-VERSION\n" "Freeciv %s wird voraussichtlich im %s auf %s veröffentlicht werden." -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15523,7 +15504,7 @@ "DIES IST EINE BETA-VERSION\n" "Freeciv %s wird voraussichtlich auf %s veröffentlicht werden." -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Weil Zivilisation frei sein sollte!" @@ -16453,61 +16434,61 @@ "Jeder Steuerfahnder produziert pro Runde zwei extra Goldstücke für Ihre " "Schatzkammer." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "europäisch" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "klassisch" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "tropisch" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "asiatisch" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "babylonisch" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "keltisch" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renaissance" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industriezeitalter" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "postmodern" @@ -18351,18 +18332,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "Soldat" @@ -19162,14 +19143,14 @@ "Weltwunder in nur einem Zug fertigstellen!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarenanführer" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21182,9 +21163,9 @@ "Kundschafter sind mutige Leute, die für die Erkundung von unbekanntem " "Gelände sehr nützlich sind." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21615,8 +21596,8 @@ "Jeder Steuereintreiber produziert drei Extra-Goldstücke für Ihre " "Schatzkammer." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Elektrische Ära" @@ -22097,13 +22078,19 @@ "Dies sind Sie selbst! Wenn Sie diese Einheit verlieren, ist das Spiel " "verloren." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "• Kann nur von Barbaren gebaut werden.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -31632,19 +31619,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Unbekannt" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Nicht installiert" @@ -31700,11 +31687,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Freeciv Modpack-Installer (Kommandozeilenversion)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Modpack erfolgreich installiert" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Modpack-Installation fehlgeschlagen: %s" @@ -31736,7 +31723,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Modpack von der angegebenen URL automatisch installieren" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31744,7 +31731,7 @@ "Es läuft eine Modpack-Installation.\n" "Wollen Sie das Programm wirklich beenden?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Es ist bereits ein anderer Download aktiv" @@ -31752,7 +31739,7 @@ msgid "Failed to start downloader" msgstr "Konnte Downloader nicht starten" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31761,40 +31748,40 @@ "%s%s\n" "Commit: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Installiert" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Typ" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Untertyp" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Lizenz" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Modpack installieren" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Modpack-URL" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Zu installierendes Modpack auswählen" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31804,11 +31791,11 @@ "nach '--'. Siehe die GTK-Dokumentation.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Freeciv Modpack-Installer (GTK2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Freeciv Modpack-Installer (GTK3)" @@ -32099,84 +32086,84 @@ msgid "A poorly-named city" msgstr "Eine schlecht benannte Stadt" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Heimatstadt von %s ist jetzt %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "Die %s verfügen schon über einen %s. Übertragung nicht möglich." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s in %s von %s nach %s transportiert." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s von %s nach %s überführt." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "Die %sen %s gingen beim Transfer in die %se Stadt %s verloren." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s gingen mit der Kontrolle von %s verloren." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "%s wurde in %s neu errichtet." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Es gab bereits eine Stadt namens %s. Sie wurde in %s umbenannt." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Die Bevölkerung in %s ist von Ihren technologischen Errungenschaften " "begeistert!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Arbeiter haben %s spontan mit eine/r/m %s ausgestattet." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Arbeiter haben spontan die %s-Straßen modernisiert." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Arbeiter haben spontan die %s-Stützpunkte modernisiert." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Sie haben %s gegründet." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Die %s sind aus der aufgelösten Stadt %s geflohen, da sie nicht auf %s " "bleiben können." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -32184,92 +32171,92 @@ "Als %s aufgelöst wurde sind, konnten die %s nicht fliehen und gingen " "verloren." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Als %s aufgelöst wurde, konnte %s nicht aus %s fliehen und ging verloren." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "%s wurde völlig zerstört." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s wurde von %s zerstört." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Sie haben %s erobert. Beute im Wert von %d Goldstück gemacht!" msgstr[1] "Sie haben %s erobert. Beute im Wert von %d Goldstücken gemacht!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s hat %s erobert und Beute im Wert von %d Goldstück gemacht." msgstr[1] "%s hat %s erobert und Beute im Wert von %d Goldstücken gemacht." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Sie haben %s erobert." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s hat %s erobert." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "%s wurde befreit! Beute im Wert von %d Goldstück gemacht." msgstr[1] "%s wurde befreit! Beute im Wert von %d Goldstücken gemacht." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s befreite %s und machte Beute im Wert von %d Goldstück." msgstr[1] "%s befreite %s und machte Beute im Wert von %d Goldstücken." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Sie haben %s befreit!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s hat %s befreit." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" "Handelspunkte zwischen %s und %s sind zusammen mit der Stadt verlustig " "gegangen." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Der Handelsweg zwischen %s und %s ist geschlossen worden." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" "Der Handel zwischen der %sen Stadt %s und %s ist zusammen mit der Stadt " "verloren gegangen." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" @@ -32278,39 +32265,39 @@ # MG: Im Code heißt es nation_plural_for_player() für das # Nationsattribut. Das ist wohl falsch. #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "Wir haben den Handelsweg zwischen %s und der %sen Stadt %s geschlossen." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " aus der Arbeitsliste" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s baut %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "%s in %s (ab jetzt landgebunden) für %d Goldstück verkauft." msgstr[1] "%s in %s (ab jetzt landgebunden) für %d Goldstücke verkauft." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Die Größe der Stadtkarte von %s ist %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "erhöht" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "vermindert" @@ -32596,78 +32583,79 @@ msgid "The %s have started building a spaceship!" msgstr "Die %s haben mit dem Bau eines Raumschiffes begonnen!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s kann zur Zeit %s nicht bauen." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "• Kann neue Städte gründen (initiale Größe: %d).\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s hat %s fertiggestellt." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s kostet %d Bevölkerungspunkt. %s schrumpft auf Größe %d." msgstr[1] "%s kostet %d Bevölkerungspunkte. %s schrumpft auf Größe %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" "%s in %s verkauft, da die laufenden Kosten nicht erbracht werden konnten!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Zu wenig Gold. %s wurde aufgelöst." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Umweltverschmutzung bei %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Zu Ihren Ehren werden in %s Feiern veranstaltet." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Die Feiern in %s wurden abgesagt." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s wird von einer Seuche heimgesucht! Bevölkerung verloren!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Aufruhr in %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "IMMER NOCH AUFRUHR in %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "In %s wurde die Ordnung wieder hergestellt." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Das Volk hat den/die %s gestürzt, Ihr Land befindet sich im Aufruhr." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32675,13 +32663,13 @@ "aufgeben." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s wurde aufgegeben, um %s zu bekommen." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32690,7 +32678,7 @@ "Nahrung für sie gibt." #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32700,7 +32688,7 @@ "genügend Nahrung für sie gibt." #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32710,7 +32698,7 @@ "genügend Nahrung für sie gibt." #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32719,7 +32707,7 @@ "Stadtverbesserung für Wachstum mangelt." #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32728,7 +32716,7 @@ "Stadtverbesserung für Wachstum mangelt." #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32736,69 +32724,69 @@ "Migranten aus %s (%s) können nicht nach %s ziehen, weil es dort an einer " "Stadtverbesserung für Wachstum mangelt." -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s wurde von seinen Bürgern verlassen." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" "Migranten zogen von %s auf der Suche nach einem besseren Leben nach %s." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" "Migranten zogen von %s auf der Suche nach einem besseren Leben nach %s (%s)." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" "Migranten zogen von %s (%s) auf der Suche nach einem besseren Leben nach %s." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "In %s hat es ein(e) %s gegeben!" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Fallout bei %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s fordert Menschenleben in %s!" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%2$s in %3$s liegt wegen %1$s in Trümmern." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "All die Nahrung in %s ist verdorben!" #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "" "Die Produktion in %2$s wurde vernichtet. All die Arbeit an %1$s war umsonst!" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -32806,7 +32794,7 @@ "umzuziehen." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34808,39 +34796,39 @@ msgid "Your %s was captured after completing the mission." msgstr "%s wurden nach Beendigung ihrer Mission gefangen genommen." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Die Bestechung der %sen %s hat einen diplomatische Eklat verursacht!" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" "%s hat mit der Bestechung von %s einen diplomatischen Eklat verursacht!" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "Sie haben durch den Diebstahl der Forschungsergebnisse von %s einen " "diplomatischen Eklat verursacht!" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s hat durch den Diebstahl Ihrer Forschungsergebnisse einen diplomatischen " "Eklat verursacht!" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "Die Anstiftung zu einer Revolte in %s hat einen diplomatischen Eklat " "verursacht." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -35226,19 +35214,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Die zulässige Rundenzeit ist negativ, sie wird auf Null gesetzt." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Der Server konnte die Startpositionen nicht festlegen." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Große Landfläche - bitte warten..." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Kartengenerator 3 hat nicht alle großen Inseln erzeugt." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Kartengenerator 3 hat %li Land nicht plaziert." @@ -35437,12 +35425,12 @@ "Arbeiter versammeln sich spontan und entscheiden, alle Städte mit besseren " "Stützpunkten auszustatten." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Ihre %s wurde wegen Veränderung des Geländes verschoben." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Ihre %s wurde wegen Veränderung des Geländes aufgelöst." @@ -36126,8 +36114,8 @@ "dass es sich um eine ältere Sicherung handelt oder dass die Sicherungsdatei " "beschädigt ist. Wenn Sie weitermachen wollen: Auf eigene Gefahr!" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -39022,7 +39010,16 @@ "Die Feuerpause mit %s ist beendet. Sie und die %s befinden sich jetzt im " "Krieg." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Der Waffenstillstand zwischen den %s und den %s ist ausgelaufen, sie " +"befinden sich nun im Krieg. Sie beenden Ihre Allianz mit beiden." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -39031,55 +39028,55 @@ "Der Waffenstillstand zwischen den %s und den %s ist ausgelaufen, sie " "befinden sich nun im Krieg. Sie beenden Ihre Allianz mit beiden." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Raumschiffkomponenten, die noch immer nicht eingebaut wurden, wurden " "automatisch eingebaut." # MG: TECHNICAL -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Unsupported compression type %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Konnte das Spiel nicht in der Datei '%s' speichern" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Spiel gespeichert als '%s'" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Das Spiel hat bereits angefangen." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Spiel begonnen." # EH: Diese Fehlermeldung sollte mE nicht übersetzt werden. -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "request for unknown report (type %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Warnung: Client %s ist zu alt und wurde abgewiesen" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -39087,51 +39084,51 @@ "Ihr Client ist zu alt. Um diesen Server zu benutzen, benötigen SieFreeciv " "Version 2.2 oder neuer." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Keine Berechtigung zur Änderung." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "Die %sische Nation steht für die Nutzerauswahl nicht zur Verfügung." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Die Nation der %s ist bereits vergeben." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s ist der %se Herrscher %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "Mehr als die Einstellung „maxplayers“ erlaubt angefordert" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "nicht ausreichend spielbare Nationen in diesem Nationensatz (siehe " "Einstellung „nationset“)" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "nicht genügend spielbare Nationen" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s beherrscht die %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -39139,34 +39136,34 @@ "Unterstützung des Freeciv-Servers für Spieler-Authentifizierung verfügbar, " "wird aber nicht verwendet." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Sende Informationen an den Metaserver <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Starte nicht ohne die explizit angeforderte Verbindung zum Metaserver." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Das Spiel ist vorbei..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "Konnte keine passende Karte erzeugen, versuche eine andere Zufallsbasiszahl" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Kann keine auf die geforderten Einstellungen passende Karte erzeugen." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Die Einstellung „%s“ wurde von %s nach %s korrigiert." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Bereit zur Annahme von Klientverbindungen auf Port %d." @@ -41052,19 +41049,19 @@ "Die %s erlangen als Ergebnis ihrer Bemühungen um die Erforschung von %s " "zusätzlich die Kenntnis um %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Unzureichendes Forschungstempo. Wir haben die Zukunftstechnologie Nr. %d " "verloren." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Unzureichendes Forschungstempo. Wir haben %s verloren." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -41074,7 +41071,7 @@ "erforderlichen Kenntnisse verloren gingen! Das Volk hat eine Revolution mit " "dem Ziel „%s“ begonnen!" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -41083,34 +41080,34 @@ "Die für Ihre angestrebte Regierungsform „%s“ erforderlichen Kenntnisse sind " "verloren gegangen. Die Bürger entschieden sich stattdessen für „%s“." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" "%s kann %s nicht bauen, da die erforderlichen Kenntnisse in Vergessenheit " "geraten sind." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Unser Forschungsziel ist %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Sie haben %s von den %s gestohlen." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Die %s haben %s von Ihnen gestohlen!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Die %s haben %s von den %s gestohlen." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -42056,6 +42053,18 @@ msgid "error %d (compiled without strerror)" msgstr "error %d (compiled without strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), %s-Klient." + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), Qt-Klient." + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv Version %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s kann zur Zeit %s nicht bauen." + #~ msgid "Ruleset _Version:" #~ msgstr "_Regelsatz:" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/el.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/el.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/el.po freeciv-2.5.8/translations/freeciv/el.po --- freeciv-2.5.7/translations/freeciv/el.po 2017-05-13 12:07:48.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/el.po 2017-08-12 11:54:33.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: freeciv 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:51+0300\n" "Last-Translator: Prekates Alexandros \n" "Language-Team: Greek translation team \n" @@ -348,12 +348,12 @@ "*%s (AI)* Μας επιτέθηκαν αγρίως οι %s, και χρειαζόμαστε τη βοηθειά σου! " "Τίμησε την δοξασμένη συμμαχία μας και το ονομά σου δεν θα ξεχαστεί ποτέ!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Το %s έχει σταματήσει να χτίζει το %s στο %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Το %s έχει αρχίσει να χτίζει το %s στο %s." @@ -391,7 +391,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -787,13 +787,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1890,10 +1890,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Σημαία" @@ -2632,7 +2632,7 @@ msgstr "Ποιό έθνος θα είσαι;" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Επέλεξε έθνος" @@ -3299,16 +3299,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Όνομα" @@ -3428,11 +3428,11 @@ msgstr "Έθνη" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Τύπος" @@ -3603,9 +3603,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Άγνωστο" @@ -3729,7 +3729,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Ανέφερε λάθη σε <%s>.\n" @@ -3753,7 +3753,7 @@ msgstr "Shift+Έντερ" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4134,12 +4134,12 @@ msgid "Load Lua Script" msgstr "_Φόρτωσε μονάδα" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Χτίσε νεά πόλη" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4172,8 +4172,8 @@ msgid "Set local options" msgstr "Θέσε τοπικές επιλογές" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Ρυθμίσεις παιχνιδίου" @@ -4585,8 +4585,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Ξεκίνησέ _σενάριο" @@ -4979,7 +4979,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "" @@ -4990,7 +4990,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4998,370 +4998,363 @@ "%s client" msgstr "Freeciv έκδοση %s %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Freeciv έκδοση %s %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Ξεκίνησε _νέο παιχνίδι" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Φόρτωσε αποθηκευμένο παιχνίδι" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Σύνδεση σε δικτυακό παιχνίδι" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Σύνδεση σε ζώνη παιχνιδίων" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Επέλεξε κατάλογο αποθήκευσης" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Περιηγήσου" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Τα συνθηματικά δεν ταιριάζουν, παρακαλώ εισήγαγε συνθηματικό" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Όνομα εξυπηρετητή" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Θύρα" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Έκδοση" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Κατάσταση" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Παίχτες" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Καλύβα: %s" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Σχόλιο" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Τοπικό _δίκτυο" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_ΜετάΕξυπηρετητής διαδικτύου" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Υπολογιστής:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Θύρα" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Είσοδος" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Συν_θηματικό" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Επι_βεβαίωσε συνθηματικό" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Σ_ύνδεση" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Όνομα σύνδεσης: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Όνομα παίχτη: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Υπολογιστής: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Πληροφορίες παίχτη/σύνδεσης" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s πληροφορίες" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Κάνε παίχτη ενεργό" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Επέλεξε έθνος" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Παρατήρησε αυτόν τον παίχτη" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Επέλεξε αυτόν τον παίχτη" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Διέκοψε σύνδεση" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Άλλαξε ΤΝ παίχτη" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Αφαίρεσε παίχτη" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Δώσε πρόσβαση σε πληροφορία" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Βάλε σε %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Όχι έ_τοιμος" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Έτοιμος" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Εκκίνηση" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Επέλεξε αυτόν τον παίχτη" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Διάλεξε _Εθνος" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Επέλεξε αυτόν τον παίχτη" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Παρατηρητής: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Παρακολoύθησε" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "_Μην παρακολουθείς" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "<Εύκολη ΤΝ>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Τυχαίο" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Παρακολούθησε" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Αποκομμένο" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Αριθμός παιχτών (συμπεριλαμβανομένων ΤΝ):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Επίπεδο επιδεξιότητας _ΤΝ" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Έρημος" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Περισσότερες επι_λογές παιχνιδίου..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Καταγραφή" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Βαθμολογία" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Έτοιμος" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?Player:Όνομα" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Ομάδα" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Διάλεξε αποθηκευμένο παιχνίδι για φόρτωμα" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Διάλεξε αποθηκευμένο παιχνίδι για _φόρτωμα" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Επέλεξε ένα σενάριο" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Επέλεξε _σενάριο" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Αποθήκευση _ΌνομαΑρχείου" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Αποθήκευση παιχνίδι" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Αποθηκευμένα _Παιχνίδια" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Αποθήκευση _ΌνομαΑρχείου" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Αποθήκευσε _σενάριο" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Αποθήκευσε εικόνα χάρτη" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Αποθηκευμένες _εικόνες χάρτων" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Αποθηκευμένα _Παιχνίδια" @@ -5900,7 +5893,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Συν_θηματικό" @@ -5940,7 +5933,7 @@ msgstr "Όρισε νεα πρωτεύουσα" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "Φόρτ_ωσε" @@ -6217,8 +6210,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6409,7 +6402,7 @@ msgstr[0] "Είσαι σίγουρος ότι θέλεις να τερματίσεις;" msgstr[1] "Είσαι σίγουρος ότι θέλεις να τερματίσεις;" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6425,7 +6418,7 @@ msgid "Yes" msgstr "Ναι" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6513,13 +6506,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Αυτός είναι ο Qt-πελάτης του Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_Μην παρακολουθείς" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Παρακολoύθησε" @@ -6553,7 +6546,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Έξοδος" @@ -6724,9 +6717,9 @@ msgid "Game" msgstr "Παιχνίδι" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Επιλογές" @@ -6755,8 +6748,8 @@ msgid "Leave game" msgstr "Αποθήκευση παιχνίδι" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7044,7 +7037,7 @@ msgstr "Ποσοστό _φόρων" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7097,7 +7090,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "" @@ -7108,142 +7101,136 @@ msgstr "Εφάρμοσε μια φορά" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Freeciv έκδοση %s %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Μονάδες: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "επιστήμονας" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Πόλη: %s (%s)" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Ξεκίνησε νεο παιχνίδι" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "_Φόρτωσε αποθηκευμένο παιχνίδι" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Σύνδεση σε δικτυακό παιχνίδι" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Σύνδεση " -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_Είσοδος" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Συν_θηματικό" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Επι_βεβαίωσε συνθηματικό" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_ΜετάΕξυπηρετητής διαδικτύου" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Παρακολούθησε" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Περιηγήσου" -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "_Ηγέτης" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Εκκίνηση" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Επέλεξε αυτόν τον παίχτη" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Αποθήκευση _ΌνομαΑρχείου" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Ξεκίνησέ _σενάριο" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Παρακολούθησε" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Όχι έ_τοιμος" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Βάλε σε %s" @@ -7355,7 +7342,7 @@ msgid "Back" msgstr "Πίσω" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Φόρτωσε παιχνίδι" @@ -8511,44 +8498,38 @@ msgstr "Πρόσθεσε νεα λίστα εργασιών" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv έκδοση %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv έκδοση %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "επιστήμονας" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Ξεκίνησε νεο παιχνίδι" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Μπες στο παιχνίδι" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Μπες στον Pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Μπες στον τοπικό εξυπηρετητή" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Ο πελάτης SDL σε καλοσορίζει..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Πόλη: %s" @@ -15527,84 +15508,84 @@ msgid "?unitflag:Hunter" msgstr "Ελικόπτερο" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv έκδοση %s %s" -#: common/version.c:45 +#: common/version.c:41 #, fuzzy msgid "(beta version)" msgstr "(έκδοση βήτα)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv έκδοση %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv έκδοση %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "έκδοση βήτα-τεστ" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "έκδοση " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Ιανουάριος" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Φεβρουάριος" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Μάρτιος" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Απρίλιος" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Μάιος" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Ιούνιος" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Ιούλιος" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Αύγουστος" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Σεπτέμβριος" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Οχτώμβριος" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Νοέμβριος" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Δεκέμβριος" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15614,7 +15595,7 @@ "Το Freeciv %s θα εκδοθεί στις\n" "%s, την %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15624,7 +15605,7 @@ "Το Freeciv %s θα εκδοθεί στις\n" "%s, την %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "`Γιατί ο πολιτισμός θα'πρεπε να είναι δωρεάν!" @@ -16510,61 +16491,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Ευρωπαϊκό" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Κλασσικό" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Τροπικό" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Ασιατικό" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Βαβυλωνιακό" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Κελτικό" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Αναγεννησιακό" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Βιομηχανικό" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Μοντέρνου" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Μεταμοντέρνου" @@ -18349,18 +18330,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "νεά" @@ -19002,14 +18983,14 @@ "σε ένα γύρο:" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Αρχηγός Βαρβάρων" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20873,9 +20854,9 @@ msgstr "" "Οι εξευρευνητές είναι πολύ χρήσιμοι για την ανίχνευση άγνωστης περιοχής." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21294,8 +21275,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:Κελτικό" @@ -21706,13 +21687,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "Αν χάσεις αυτή τη μονάδα , χάνεις και το παιχνίδι.Πρόσεξε." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Μόνο μονάδες αλεξιπτωτιστών μπορούν να το κάνουν αυτό." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29545,20 +29532,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Άγνωστο" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29613,11 +29600,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Επέλεξε Προόδο για να κλέψεις" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29649,14 +29636,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Είσαι σίγουρος ότι θέλεις να τερματίσεις;" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29665,60 +29652,60 @@ msgid "Failed to start downloader" msgstr "αποκόλληση από ένα παίχτη" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Επέλεξε Προόδο για να κλέψεις" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Επέλεξε Προόδο για να κλέψεις" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Επέλεξε Προόδο για να κλέψεις" @@ -30009,50 +29996,50 @@ msgid "A poorly-named city" msgstr "Μια πόλη φτωχά ονοματισμένη." -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Αλλαγή κεντρικήςπόλης από %s σε %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Μεταφέρθηκαν %s στο %s από %s στο %s" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Μεταφέρθηκαν %s από %s στο %s" #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s από %s χάθηκαν στην μεταφορά προς του %s την %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s χάθηκαν μαζί με τον έλεγχο της %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Έχασες %s. Νέο %s χτίζετε στην %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Έχεις ήδη μια πόλη που καλείτε %s. Η πόλη μετονομάστηκε σε %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -30061,160 +30048,160 @@ " Οι εργάτες αυτόματα συγκεντρώθηκαν και αναβάθμισαν την πόλη με " "σιδηρόδρομους." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Ίδρυσες το %s. " -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Μετακινήθηκαν %s έξω από διασκορπισθείσα πόλη %s για την αποφυγή " "αποκλεισμού. " -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Όταν %s διασκορπίσθηκε οι %s δεν μπόρεσαν να βγούν έξω και γι'αυτό χάθηκαν. " -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Όταν %s διασκορπίσθηκε οι %s δεν μπόρεσαν να βγούν έξω και γι'αυτό χάθηκαν. " -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Κατέστρεψες τη %s ολοκληρωτικά." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s καταστράφηκε από %s " -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Κατέκτησες %s: τα λάφυρά σου συνολικά είναι %d χρυσό!" msgstr[1] "Κατέκτησες %s: τα λάφυρά σου συνολικά είναι %d χρυσά!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s κατακτήσε %s και λαφυραγώγησε %d χρυσό από την πόλη. " msgstr[1] "%s κατακτήσε %s και λαφυραγώγησε %d χρυσά από την πόλη. " -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Κατέκτησες %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s κατέκτησε %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Απελευθέρωσες τη %s! Τα λάφυρα είναι συνολικά %d χρυσό. " msgstr[1] "Απελευθέρωσες τη %s! Τα λάφυρα είναι συνολικά %d χρυσά. " -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s απελευθέρωσε τη %s και λαφυραγώγησε %d χρυσό από την πόλη. " msgstr[1] "%s απελευθέρωσε τη %s και λαφυραγώγησε %d χρυσά από την πόλη. " -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Απελευθέρωσες τη %s! " -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s απελευθερώθηκε από %s" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Μεταφέρθηκαν %s στο %s από %s στο %s" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " από τη λίστα εργασίας" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s χτίζει %s%s" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Πουλάς %s στην %s (τώρα αποκλεισμένο) για %d χρυσά." msgstr[1] "Πουλάς %s στην %s (τώρα αποκλεισμένο) για %d χρυσά." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "Ο %s του %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Αεροπορική βάση" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30498,77 +30485,78 @@ msgid "The %s have started building a spaceship!" msgstr "Οι %s άρχισαν να χτίζουν διαστημόπλοιο!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s δεν μπορεί ακόμα να χτιστεί %s ." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s τελείωσε το χτίσιμο %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Δεν μπορεί να διατηρεί %s στο %s, πωλείται το κτίριο !" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "%s δεν μπορει'να συντηρηθεί %s, η μονάδα διαλύεται." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Μόλυνση κοντά %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Εορτασμοί στο όνομά σας στην %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "το %s έθνος χρησιμοποιείται ήδη." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Αναταραχές στη %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "ΣΥΝΕΧΙΖΟΝΤΑΙ ΟΙ ΑΝΑΤΑΡΑΧΕΣ στη %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Αποκαταστάθηκε η τάξη στη %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Οι πολίτες κατέλυσαν την %s, η χώρα σου είναι σε αναβρασμό." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -30576,20 +30564,20 @@ "μοναδική μας πόλη." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s διαλύεται σε %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30597,7 +30585,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30605,91 +30593,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s διαλύεται σε %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s καταστράφηκε από %s " -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Μόλυνση κοντά %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Λιμός προκαλεί μείωση πληθυσμού στη %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "Αντιτορπιλικό" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Αποκαταστάθηκε η τάξη στη %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Η παραγωγή του %s αναβαθμίζεται σε %s σε %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32572,32 +32560,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "Οι %s τελείωσαν να χτίζουν %s στο %s." @@ -32916,19 +32904,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -33108,12 +33096,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -33804,8 +33792,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s προστέθηκε σαν %s επιπέδου παίχτης ελεγχόμενος από ΤΝ." @@ -36510,7 +36498,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Η κατάπαυση πυρός μεταξύ %s και %s έχει λήξει. Είναι σε πόλεμο. Ακυρώνεις " +"συμμαχία με %s. " + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36519,51 +36516,51 @@ "Η κατάπαυση πυρός μεταξύ %s και %s έχει λήξει. Είναι σε πόλεμο. Ακυρώνεις " "συμμαχία με %s. " -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Αποτυχία αποθήκευσης παιχνιδίου σαν %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Το παιχνίδι σώθηκε σαν %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Το παιχνίδι τρέχει ήδη." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "%s έχασε έλεγχο cmdlevel κατά την εκκίνηση του παιχνιδίου. Χρησιμοποίησε " "ψηφοφορία από δώ και πέρα." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Αρχίζει το παιχνίδι. " -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "αίτηση για αγνώστη αναφορά (τύπου %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Προειδοποίηση: απορρίπτεται ο παλιός πελάτης %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 #, fuzzy msgid "" "Your client is too old. To use this server, please upgrade your client to a " @@ -36573,84 +36570,84 @@ "παρακαλώ αναβάθμισε τον πελάτη σου σε μια CVS έκδοση ύστερη από 2003-11-28 ή " "Freeciv 2.2 ή μετά." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Δεν επιτρέπονται επισκεπτες σε αυτόν τον εξυπηρετητή. Συγνώμη." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "το %s έθνος δεν είναι διαθέσιμο σε αυτό το σενάριο." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "το %s έθνος χρησιμοποιείται ήδη." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s είναι ο %s ηγέτης %s" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" "Περιμένοντας να αρχίσει το παιχνίδι: %d από τους %d παίχτες είναι έτοιμοι να " "αρχίσουν. " -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s κυβερνάει τους %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "metaserver <διεύθυνση>" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Το παιχνίδι τελείωσε..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "%s απομακρύνθηκε από το παιχνίδι." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Τώρα αποδέχομαι συνδέσεις πελάτη." @@ -38464,56 +38461,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39414,6 +39411,21 @@ msgstr "σφάλμα %d (μεταγλωττισμένο χωρίς strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Freeciv έκδοση %s %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Πόλη: %s (%s)" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv έκδοση %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s δεν μπορεί ακόμα να χτιστεί %s ." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/en_GB.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/en_GB.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/en_GB.po freeciv-2.5.8/translations/freeciv/en_GB.po --- freeciv-2.5.7/translations/freeciv/en_GB.po 2017-05-13 12:07:48.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/en_GB.po 2017-08-12 11:54:34.000000000 +0000 @@ -65,8 +65,8 @@ msgstr "" "Project-Id-Version: Freeciv 2.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2017-05-01 17:29+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-07-23 11:07+0100\n" "Last-Translator: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk>\n" "Language-Team: \n" "Language: en_GB\n" @@ -399,12 +399,12 @@ "*%s (AI)* We have been savagely attacked by %s, and we need your help! " "Honour our glorious alliance and your name will never be forgotten!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "The %s have stopped building The %s in %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "The %s have started building The %s in %s." @@ -442,7 +442,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -835,13 +835,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1945,10 +1945,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flag" @@ -2670,7 +2670,7 @@ msgstr "What Nation Will You Be?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Pick Nation" @@ -3329,16 +3329,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Name" @@ -3448,11 +3448,11 @@ msgstr "Nations" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Type" @@ -3623,9 +3623,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Unknown" @@ -3747,7 +3747,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Report bugs at %s\n" @@ -3771,7 +3771,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "?noun:View" @@ -4140,12 +4140,12 @@ msgid "Load Lua Script" msgstr "Load Lua Script" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Build New City" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4173,8 +4173,8 @@ msgid "Set local options" msgstr "Set local options" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Game Settings" @@ -4548,8 +4548,8 @@ msgid "Game/Scenario Properties" msgstr "Game/Scenario Properties" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Save Scenario" @@ -4909,7 +4909,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, %s client" @@ -4920,7 +4920,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4931,267 +4931,260 @@ "commit: %s\n" "%s client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), %s client" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Start _New Game" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Start _Scenario Game" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Load Saved Game" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onnect to Network Game" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Connect to Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Select Location to Save" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Browse..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Passwords don't match, enter password." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Server Name" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Version" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "?count:Players" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Humans" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Comment" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Local _Area Network" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Pass_word:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irm Password:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_onnect" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Connection name: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Player name: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Player/conn info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Toggle player ready" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Pick nation" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observe this player" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Take this player" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Cut connection" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Aitoggle player" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Remove player" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Give %s access" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Put on %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Not _ready" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Ready" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Take %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Pick _Nation" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Take a Player" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Observe %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observe" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Do not _observe" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s AI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Random" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observer" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Detached" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5199,95 +5192,95 @@ "Number of _Players\n" "(including AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "AI Skill _Level:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Ruleset:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_More Game Options..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Record" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rating" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Ready" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:Leader" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Team" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Choose Saved Game to Load" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Choose Saved Game to _Load:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Choose a Scenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Choose a _Scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Filename:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Save Game" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Saved _Games:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Save _Filename:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Saved Sce_narios:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Save Sc_enario:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Save Map Image" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Saved Map _Images:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Save _Map Images:" @@ -5804,7 +5797,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Additional information is available%svia left click on the citizens." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "New Pass_word:" @@ -5841,7 +5834,7 @@ msgstr "Change homecity" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Load" @@ -6079,8 +6072,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6256,7 +6249,7 @@ msgstr[0] "Are you sure you want to disband that %1 unit?" msgstr[1] "Are you sure you want to disband those %1 units?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6272,7 +6265,7 @@ msgid "Yes" msgstr "Yes" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6358,12 +6351,12 @@ msgid "This is Qt-client for Freeciv." msgstr "This is Qt-client for Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Don't Observe" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Observe" @@ -6397,7 +6390,7 @@ "after '--'. See the Qt documentation.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Quit?" @@ -6545,9 +6538,9 @@ msgid "Game" msgstr "Game" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Options" @@ -6572,8 +6565,8 @@ msgid "Leave game" msgstr "Leave game" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6832,7 +6825,7 @@ msgstr "Tax Rates..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "?header:Players" @@ -6880,7 +6873,7 @@ msgid "... read more in help" msgstr "... read more in help" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Refresh" @@ -6890,123 +6883,117 @@ msgstr "Apply" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, Qt client" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "commit: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Qt client" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), Qt client" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Start new game" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Start scenario game" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Load saved game" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Connect to network game" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Connect" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Login" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Password" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Confirm Password" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Internet servers:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Local servers:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Date" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Browse..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Load Scenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Leader" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Disconnect" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Save Files" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Open Save File" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Scenarios Files" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Open Scenario File" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Global observers" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Not ready" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Set difficulty" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Put on team" @@ -7109,7 +7096,7 @@ msgid "Back" msgstr "Back" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Load Game" @@ -8235,44 +8222,38 @@ msgstr "Add new worklist" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "%s client" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Start New Game" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Join Game" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Join Pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Join LAN Server" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient welcomes you..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Commit: %s" @@ -15207,83 +15188,83 @@ msgid "?unitflag:Hunter" msgstr "?unitflag:Hunter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv version %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta version)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv version %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv version %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "betatest version " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "version " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "January" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "February" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "March" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "April" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "May" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "June" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "July" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "August" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "September" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "October" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "December" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15292,7 +15273,7 @@ "THIS IS A BETA VERSION\n" "Freeciv %s will be released in %s, at %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15301,7 +15282,7 @@ "THIS IS A BETA VERSION\n" "Freeciv %s will be released at %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "'Cause civilisation should be free!" @@ -16212,61 +16193,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "Each tax collector produces two extra gold for your treasury per turn." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:European" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Classical" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropical" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Asian" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babylonian" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Celtic" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renaissance" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Industrial" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:PostModern" @@ -18073,18 +18054,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "green" @@ -18843,14 +18824,14 @@ "one turn!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarian Leader" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20809,9 +20790,9 @@ "Explorers are brave individuals that are very useful for mapping unknown " "territory." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21230,8 +21211,8 @@ msgstr "" "Each tax collector produces three extra gold for your treasury per turn." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "?citystyle:ElectricAge" @@ -21671,13 +21652,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "This is you. If you lose this unit, you lose the game. So don't." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "Won't unleash barbarians from huts." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30736,19 +30722,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "?license:Unknown" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Not installed" @@ -30804,11 +30790,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Freeciv modpack installer (command line version)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Modpack installed successfully" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Modpack install failed: %s" @@ -30840,7 +30826,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Automatically install modpack from a given URL" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -30848,7 +30834,7 @@ "Modpack installation in progress.\n" "Are you sure you want to quit?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Another download already active" @@ -30856,7 +30842,7 @@ msgid "Failed to start downloader" msgstr "Failed to start downloader" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -30865,40 +30851,40 @@ "%s%s\n" "commit: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Installed" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "?modpack:Type" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Subtype" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Licence" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Install modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Modpack URL" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Select modpack to install" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -30908,11 +30894,11 @@ "after '--'. See the Gtk documentation.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Freeciv modpack installer (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Freeciv modpack installer (gtk3)" @@ -31191,205 +31177,205 @@ msgid "A poorly-named city" msgstr "A poorly-named city" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Changed homecity of %s to %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "The %s already have a %s. Can't transfer yours." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Transferred %s in %s from %s to %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Transferred %s from %s to %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s lost in transfer to %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s lost along with control of %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "A replacement %s was built in %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "You already had a city called %s. The city was renamed to %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "The people in %s are stunned by your technological insight!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Workers spontaneously gather and upgrade %s with %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Workers spontaneously gather and upgrade %s roads." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Workers spontaneously gather and upgrade %s bases." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "You have founded %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Moved %s out of disbanded city %s since it cannot stay on %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "When %s was disbanded your %s could not get out, and it was therefore lost." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "You destroy %s completely." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s has been destroyed by %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "You conquer %s; your lootings accumulate to %d gold!" msgstr[1] "You conquer %s; your lootings accumulate to %d gold!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s conquered %s and looted %d gold from the city." msgstr[1] "%s conquered %s and looted %d gold from the city." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "You conquer %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s conquered %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "You have liberated %s! Lootings accumulate to %d gold." msgstr[1] "You have liberated %s! Lootings accumulate to %d gold." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s liberated %s and looted %d gold from the city." msgstr[1] "%s liberated %s and looted %d gold from the city." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "You have liberated %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s liberated %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "Trade between %s and %s lost along with city." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Trade route between %s and %s cancelled." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "Trade between %s city %s and %s lost along with their city." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Sorry, the %s cancelled the trade route from %s to your city %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "We cancelled the trade route from %s to %s city %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " from the worklist" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s is building %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "You sell %s in %s (now landlocked) for %d gold." msgstr[1] "You sell %s in %s (now landlocked) for %d gold." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "The size of the city map of %s is %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "increased" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "reduced" @@ -31661,89 +31647,90 @@ msgid "The %s have started building a spaceship!" msgstr "The %s have started building a spaceship!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s can't build %s yet." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "%s can't build %s yet. (city size: %d, unit population cost: %d)" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s is finished building %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s cost %d population. %s shrinks to size %d." msgstr[1] "%s cost %d population. %s shrinks to size %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Can't afford to maintain %s in %s, building sold!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Not enough gold. %s disbanded." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Pollution near %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Celebrations in your honour in %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Celebrations cancelled in %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s has been struck by a plague! Population lost!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Civil disorder in %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "CIVIL DISORDER CONTINUES in %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Order restored in %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "The people have overthrown your %s, your country is in turmoil." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s can't build %s yet, and we can't disband our only city." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s is disbanded into %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31751,7 +31738,7 @@ "Migrants from %s can't go to %s because there is not enough food available!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31761,7 +31748,7 @@ "available!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31771,7 +31758,7 @@ "available!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31779,7 +31766,7 @@ "Migrants from %s can't go to %s because it needs an improvement to grow!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31787,78 +31774,78 @@ "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s was disbanded by its citizens." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Migrants from %s moved to %s in search of a better life." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Migrants from %s moved to %s (%s) in search of a better life." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Migrants from %s (%s) moved to %s in search of a better life." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%s was hit by %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Fallout near %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s causes population loss in %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s destroys %s in %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "All stored food destroyed in %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "Production of %s in %s destroyed." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "Citizens of %s are thinking about migrating to %s for a better life." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33795,32 +33782,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Your %s was captured after completing the mission." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "You have caused an incident while bribing the %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s has caused an incident while bribing your %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "You have caused an incident while attempting to steal tech from %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s has caused an incident while attempting to steal tech from you." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "You have caused an incident while inciting a revolt in %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "The %s have caused an incident while inciting a revolt in %s." @@ -34172,19 +34159,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "The turn timeout is smaller than zero, fixing at zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "The server couldn't allocate starting positions." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "High landmass - this may take a few seconds." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 didn't place all big islands." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 left %li landmass unplaced." @@ -34368,12 +34355,12 @@ "Workers spontaneously gather and upgrade all possible cities with better " "bases." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Moved your %s due to changing terrain." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Disbanded your %s due to changing terrain." @@ -35045,8 +35032,8 @@ "games, or it may indicate an invalid saved game file. Proceed at your own " "risk." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s has been added as %s level AI-controlled player (%s)." @@ -37861,7 +37848,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "The cease-fire with %s has run out. You are now at war with the %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -37870,49 +37866,49 @@ "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "Automatically placed spaceship parts that were still not placed." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Unsupported compression type %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Failed saving game as %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Game saved as %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "The game is already running." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "%s lost control cmdlevel on game start. Use voting from now on." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Starting game." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "request for unknown report (type %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Warning: rejecting old client %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -37920,50 +37916,50 @@ "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "You are not allowed to edit." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "%s nation is not available for user selection." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s nation is already in use." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s is the %s ruler %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Waiting to start game: %d out of %d players are ready to start." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "requested more than 'maxplayers' setting" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "not enough playable nations in this nation set (see 'nationset' setting)" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "not enough playable nations" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s rules the %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -37971,33 +37967,33 @@ "This freeciv-server program has player authentication support, but it's " "currently not in use." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Sending info to metaserver <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Not starting without explicitly requested metaserver connection." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "The game is over..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "Failed to create suitable map, retrying with another mapseed" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Cannot create suitable map with given settings." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Setting '%s' has been adjusted from %s to %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Now accepting new client connections on port %d." @@ -39822,17 +39818,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%s acquire %s as a result of learning %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "Insufficient science output. We lost Future Tech. %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Insufficient science output. We lost %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -39841,7 +39837,7 @@ "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -39850,32 +39846,32 @@ "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s can't build %s. The required technology was lost." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Technology goal is %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "You steal %s from the %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "The %s stole %s from you!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "The %s have stolen %s from the %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "Too bad! You made a mistake transferring the tech %s and lost it." @@ -40776,6 +40772,18 @@ msgid "error %d (compiled without strerror)" msgstr "error %d (compiled without strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), %s client" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), Qt client" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s can't build %s yet." + #~ msgid "LAN" #~ msgstr "LAN" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/eo.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/eo.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/eo.po freeciv-2.5.8/translations/freeciv/eo.po --- freeciv-2.5.7/translations/freeciv/eo.po 2017-05-13 12:07:49.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/eo.po 2017-08-12 11:54:34.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-07-10 17:52+0200\n" "Last-Translator: Antonio Codazzi \n" "Language-Team: Esperanto \n" @@ -350,12 +350,12 @@ "*%s (AI)* Ni estis sovaĝe atakitaj de %s, kaj ni bezonas vian helpon! " "Plenumu nian gloran aliancon kaj via nomo neniam estos forgesito!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "La %s ĉesis la preparadon de la %s en %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "La %s komencis la preparadon de la %s en %s." @@ -390,7 +390,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -786,13 +786,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1907,10 +1907,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flago" @@ -2641,7 +2641,7 @@ msgstr "Kiu nacio vi deziras esti?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Elektu nacion" @@ -3306,16 +3306,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nomo" @@ -3437,11 +3437,11 @@ msgstr "Nacioj" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Speco" @@ -3616,9 +3616,9 @@ msgid "Seen (Invis)" msgstr "Elektu unuo(j)n" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Nekonata" @@ -3742,7 +3742,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Bonvolu raporti pri la eraro al %s\n" @@ -3766,7 +3766,7 @@ msgstr "Ŝvkl+Enenklavo" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4146,12 +4146,12 @@ msgid "Load Lua Script" msgstr "_Ŝargu unuon" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Konstruu novan urbon" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4184,8 +4184,8 @@ msgid "Set local options" msgstr "Agordu lokajn opciojn" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Lud-agordoj" @@ -4595,8 +4595,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Startigu scenejon" @@ -4993,7 +4993,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Tiu ĉi komando estas nur por klientoj." @@ -5004,7 +5004,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5012,372 +5012,365 @@ "%s client" msgstr "Tiu ĉi komando estas nur por klientoj." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Tiu ĉi komando estas nur por klientoj." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Startigu _novan ludon" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Startigu scenejon" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Ŝargu konservitan _ludon" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "K_onekto al retan ludon" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Konekto al _areon de ludo" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Elektu lokon por konservi" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Foliumu..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Ne kongruas pasvorto, reen enigu pasvorton." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servilnomo" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Pordo" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versio" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Stato" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Ludantoj" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Homo" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Komento" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Loka _Reto" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Interreta _Metaservilo" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Gast.komp:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Pordo:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Nomo:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Pas_vorto:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Konf_irmu pasvorton:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Gast. komputilo" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "K_onektu" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nomo de la konekto: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nomo de la ludanto: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Gast.komp: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Pri ludanto/konekto" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Pri %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Elektu nacion" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observu tiun ĉi ludanton" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Prenu tiun ĉi ludanton" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Fermu konekton" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Formovu ludanton" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Ambasado" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Enigu en %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Ne preta" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Preta" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Startigu" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Prenu tiun ĉi ludanton" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Elektu _nacion" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Prenu tiun ĉi ludanton" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Observanto: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observi" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Ne _observi" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Hazarda" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observanto" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Malkonektigita" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Nombro de _ludantoj (inkluziva de la AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Lerteco de _AI:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Dezerto" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Pluaj opcioj de la ludo..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Raporto" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Skribado" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Preta" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?female:Estrino" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Grupo" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Elektu konservitan ludon" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Elektu ŝargendan konvervitan _ludon:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Elektu scenejon" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Elektu _scenejon:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Konservu dosiernomon:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Konservu ludon" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Konservitaj _ludoj:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Konservu dosiernomon:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Startigu scenejon" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Startigu scenejon" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Konservu ludon" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Konservitaj _ludoj:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Konservitaj _ludoj:" @@ -5917,7 +5910,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Pas_vorto:" @@ -5957,7 +5950,7 @@ msgstr "Kreu novan hejmurbon" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Ŝargu" @@ -6232,8 +6225,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6422,7 +6415,7 @@ msgstr[0] "Ĉu vi deziras eliri?" msgstr[1] "Ĉu vi deziras eliri?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6438,7 +6431,7 @@ msgid "Yes" msgstr "Jes" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6527,13 +6520,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Bonvenon al Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Ne _observi" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Observi" @@ -6567,7 +6560,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Eliro" @@ -6740,9 +6733,9 @@ msgid "Game" msgstr "Ludo" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opcioj" @@ -6771,8 +6764,8 @@ msgid "Leave game" msgstr "Forlasu la ludon" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7060,7 +7053,7 @@ msgstr "Impostado" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7113,7 +7106,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Ĝisdatigu" @@ -7124,143 +7117,137 @@ msgstr "Apliku unufoje" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Tiu ĉi komando estas nur por klientoj." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unuo: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Tiu ĉi komando estas nur por klientoj." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Tiu ĉi komando estas nur por klientoj." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Startigu novan ludon" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Startigu scenejon" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Ŝargu konservitan ludon" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "K_onekto al retan ludon" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Konektu" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Nomo:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Pasvorto:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Konf_irmu pasvorton:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Interreta _Metaservilo" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Observanto" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Foliumu..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Startigu scenejon" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Estro:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Malkonektiĝu" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Komencu" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Prenu tiun ĉi ludanton" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Konservu dosiernomon:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Startigu scenejon" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Startigu scenejon" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Observanto" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Ne preta" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", ludonivelo %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Enigu en %s" @@ -7372,7 +7359,7 @@ msgid "Back" msgstr "Antaŭe" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Ŝargu ludon" @@ -8522,44 +8509,38 @@ msgstr "Aldonu novan laborliston" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versio %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Tiu ĉi komando estas nur por klientoj." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Startigu novan ludon" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Aliĝu al ludo" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Aliĝu al la servilo" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Aliĝu al la loka reto" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient bonvenigas vin..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Urbo: %s" @@ -15535,83 +15516,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopteroj" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versio %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versio beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versio %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versio %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versio beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versio " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Januaro" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februaro" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Marto" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Aprilo" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Majo" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Junio" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Julio" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Aŭgusto" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Septembro" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktobro" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Novembro" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Decembro" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15621,7 +15602,7 @@ "Freeciv %s estos publikigita\n" "%s, ĉe %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15631,7 +15612,7 @@ "Freeciv %s estos publikigita\n" "%s, ĉe %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Ĉar la civiliziĝo devas esti libera!" @@ -16437,61 +16418,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Eŭropa" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klasika" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropika" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Azia" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babilona" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Kelta" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renesanca" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Industria" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Moderna" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Postmoderna" @@ -18182,18 +18163,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "rekruta" @@ -18819,14 +18800,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarestro" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20533,9 +20514,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20892,8 +20873,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:Kelta" @@ -21286,13 +21267,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28112,20 +28098,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Nekonata" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -28180,12 +28166,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Elektu forŝtelendan avanaĵon" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s estis transportitaj sukcese." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28217,14 +28203,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Ĉu vi deziras eliri?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -28233,60 +28219,60 @@ msgid "Failed to start downloader" msgstr "%s malsukcesis konekti kun iu ajn ludanto." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Elektu forŝtelendan avanaĵon" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Elektu forŝtelendan avanaĵon" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Elektu forŝtelendan avanaĵon" @@ -28562,210 +28548,210 @@ msgid "A poorly-named city" msgstr "Strangenomita urbo" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Estas ŝanĝita hejmurbo de %s al %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s estas translokitaj en %s de %s al %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s estas translokitaj de %s al %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%sj %s estis perditaj dum translokado al %sj %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s estis perditaj kun regilo de %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Anstataŭigo de %s estis konstruita en %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Via jam havas urbon nomitan %s. La urbo estis renomita %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Popolo en %s supermiriĝas je via vido pri teĥnologio!\n" " Laborantoj memvole grupiĝis kaj modernigis la urbon pere de fervojo." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Vi fondis %s-n." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "%s estis movita ekster la forlasitan urbon %s ekde tiam ĝi ne povas resti en " "%s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Kiam %s estis forlasita, viaj %s ne povis foriri kaj do ĝi estis perdita." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Kiam %s estis forlasita, viaj %s ne povis foriri kaj do ĝi estis perdita." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Vi tute detruis %sn." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s estis detruita de %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Vi konkeris %s-n; vi kaptis %d oran moneron!" msgstr[1] "Vi konkeris %s-n; vi kaptis %d orajn monerojn!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s konkeris %s-n kaj kaptis %d oran moneron el la urbo." msgstr[1] "%s konkeris %s-n kaj kaptis %d orajn monerojn el la urbo." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Vi konkeris %s-n" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s konkeris %s-n." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Vi liberigis %s-n! Disrabado sumas je %d ora monero." msgstr[1] "Vi liberigis %s-n! Disrabado sumas je %d oraj moneroj." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s liberigis %s-n kaj rabegis %d oran moneron el la urbo." msgstr[1] "%s liberigis %s-n kaj rabegis %d orajn monerojn el la urbo." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Vi liberigis %s-n!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s liberigis %s-n." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Bedaŭrinde, %s forigis la komercan kurson de %s ĝis via urbo %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Bedaŭrinde, %s forigis la komercan kurson de %s ĝis via urbo %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " el la laborlisto" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s estas konstruanta %s%s-n." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vi vendis %sn en %s (nun landinterna) per %d oraj moneroj." msgstr[1] "Vi vendis %sn en %s (nun landinterna) per %d oraj moneroj." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "La %s de la %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Avia bazo" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -29047,99 +29033,100 @@ msgid "The %s have started building a spaceship!" msgstr "La %s komencis konstrui kosmoŝipon!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s ne povas ankoraŭ konstrui %sn." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s plenumis preparadon de %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" "Viaj enspezoj ne permesas al vi bontenadon de %s en %s, do la konstruaĵo " "estis vendita!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Oro estas nesufiĉa. %s estas dissolvitaj" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Poluado ĉe %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Celebrado por vi en %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "La celebrado en %s estas nuligita." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Civitana ribelo en %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "CIVITANA RIBELO PLUDAŬRAS en %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Publika ordo estis restarigita en %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "La popolo eksigis vian %s, la nacio ekribelas." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s ne povas ankoraŭ konstrui %sn kaj ni ne povas forlasi nian nuran urbon." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s estis forlasita en %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29147,7 +29134,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29155,91 +29142,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s estis forlasita en %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s estis atombombita fare de %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Poluado ĉe %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Malsatmizero kaŭzas malpliigon de loĝantaro en %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "La %s detruis la %sn en %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Viaj %s detruis la %sn en %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Produktado de %s altiĝis ĝis %s en %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30963,32 +30950,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Via %s estis kaptita post la plenumo de la tasko." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Vi kaŭzis diplomatan incidenton dum subaĉetado de la %sj %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s kaŭzis diplomatan incidenton dum subaĉetado de via %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Vi kaŭzis diplomatan incidenton dum ŝtelado de teĥnologio de %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s kaŭzis diplomatan incidenton dum ŝtelado de teĥnologio de vi." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Vi kaŭzis diplomatan incidenton dum instigado al ribelo en %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s kaŭzis diplomatan incidenton dum instigado al ribelo en %s." @@ -31308,19 +31295,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "La generatoro 3 ne lokis ĉiujn grandajn insulojn." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "La generatoro 3 lasis ne-lokita %li da lando." @@ -31495,12 +31482,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Viaj %s estis movita pro ŝanĝo de speco de areo." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Viaj %s estis forsalutita pro ŝanĝo de grundo." @@ -32184,8 +32171,8 @@ "konservitaj ludoj, aŭ tio signifas ke la konservita dosiero estas nevalida. " "Pluiru laŭ via propra risko." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s estis aldonita kiel AI-ludanto je %s nivelo " @@ -34664,7 +34651,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "La pafĉesigo kun %s finis. Nun vi estas en milito kun la %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"La pafĉesigo inter %s kaj %s finis. Ili estas militantaj. Vi nuligas vian " +"aliancon kun ambaŭ ili." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -34673,49 +34669,49 @@ "La pafĉesigo inter %s kaj %s finis. Ili estas militantaj. Vi nuligas vian " "aliancon kun ambaŭ ili." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "Nesubtenita kunpremo %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Malsukcesis la konservado de la ludo kiel %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "La ludo estas konservita kiel %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "La ludo estas jam plenumanta." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Komenco de la ludo." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "mendo pri nekonata raporto (speco %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Atentu: malnova kliento %s estas rifuzita" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -34723,84 +34719,84 @@ "Vi kliento estas tro malnova. Por uzi tiun ĉi servilon, bonvolu anstataŭigi " "vian kliento per Freeciv 2.2 aŭ sekvaj versioj." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Vi ne rajtas agordi tiun ĉi opcion." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s nacio ne estas disponebla en tiu ĉi scenejo." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s nacio estas jam uzata." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s estas la %s estro %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s estas la %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Sendante informojn al la metaservilo [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "La ludo estas finita..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Vi ne povas krei unuon en malamika areo." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opcio: %s estis agordita je \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Nun novaj konektoj de klientoj estas akcepteblaj." @@ -36620,56 +36616,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Teĥnologia celo estas %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Vi forŝtelis %sn de la %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "La %s forŝtelis %sn de vi!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "La %s forŝtelis %sn de la %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -37580,6 +37576,21 @@ msgid "error %d (compiled without strerror)" msgstr "eraro %d (kompilumita sen strerror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Tiu ĉi komando estas nur por klientoj." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Tiu ĉi komando estas nur por klientoj." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versio %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ne povas ankoraŭ konstrui %sn." + #~ msgid "Ruleset _Version:" #~ msgstr "_Versio de la reguloj:" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/es.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/es.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/es.po freeciv-2.5.8/translations/freeciv/es.po --- freeciv-2.5.7/translations/freeciv/es.po 2017-05-13 12:07:49.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/es.po 2017-08-12 11:54:35.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2016-07-19 12:06+0200\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-07 23:13+0100\n" "Last-Translator: Jordi Negrevernis i Font \n" "Language-Team: Spanish <>\n" "Language: es_ES\n" @@ -363,12 +363,12 @@ "necesitamos tu ayuda! ¡Honra nuestra gloriosa alianza y tu nombre nunca será " "olvidado!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Los %s han dejado de construir %s en %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Los %s han empezado a construir %s en %s." @@ -406,7 +406,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -800,13 +800,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1921,10 +1921,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bandera" @@ -2646,7 +2646,7 @@ msgstr "¿Qué nación quieres ser?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Elegir Nación" @@ -3307,16 +3307,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nombre" @@ -3426,11 +3426,11 @@ msgstr "Naciones" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipo" @@ -3603,9 +3603,9 @@ msgid "Seen (Invis)" msgstr "Vistos (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Desconocido" @@ -3727,7 +3727,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Informa de los errores a %s\n" @@ -3751,7 +3751,7 @@ msgstr "Mayúsculas+Intro" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Vista general" @@ -4121,12 +4121,12 @@ msgid "Load Lua Script" msgstr "Cargar Secuencia Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construir nueva ciudad" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4157,8 +4157,8 @@ msgid "Set local options" msgstr "Cambiar opciones locales" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Preferencias de la partida" @@ -4532,8 +4532,8 @@ msgid "Game/Scenario Properties" msgstr "Propiedades de la Partida/Escenario" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Guardar el Escenario" @@ -4893,7 +4893,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, cliente %s." @@ -4904,7 +4904,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4915,267 +4915,260 @@ "commit: %s\n" "cliente %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), cliente %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Empezar una _nueva partida" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Empezar un e_scenario" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Cargar(_L) una partida guardada" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onectar con un juego en red" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Conectar con _Zona de Juegos" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Elige camino para grabar" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Navegar..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Las contraseñas no coinciden, introduce tu contraseña." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nombre del servidor" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Puerto" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versión" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Estado" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Jugadores" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Humanos" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Comentario" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Red de _Área Local" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Metaservidor de Internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Servidor:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Puerto:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Usuario:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Co_ntraseña:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irme Contraseña:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Servidor" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_onectar" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nombre de la conexión: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nombre del jugador: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Serv: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Información de jugad/conex" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Info. de %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Activa/Desact. jugador listo" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Elegir nación" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observar a este jugador" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Elegir este jugador" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Cerrar la conexión" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Aitoggle jugador" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Eliminar jugador" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Dar acceso %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Poner en %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "No _preparado" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Listo" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Comenzar" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "Con_trolar %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Elegir _Nación" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Con_trolar un jugador" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Observar a %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observar" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "No _observar" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Aleatorio" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observador" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Separado" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5183,95 +5176,95 @@ "Número de _Jugadores\n" "(incluyendo ordenadores):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Nive_l de los Jugadores Controlados por Ordenador:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Ruleset:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Más _Opciones del Juego..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Registro" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Grado" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Listo" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Líder" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Equipo" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Escoja la partida guardada a cargar" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Escoja la partida guardada a _Cargar:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Escoger un Escenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Escoger un E_scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nombre de fichero:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Grabar la partida" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Partidas _Grabadas:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Grabar a Nombre_Fichero:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Escenarios guardados:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Guardar el Esc_enario:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Grabar la Imagen del Mapa" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "_Imágenes de Mapa Grabadas:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Guarda la Imagen del _Mapa:" @@ -5790,7 +5783,7 @@ "Hay información adicional disponible %s con un clic izquierdo en los " "ciudadanos." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Nueva Co_ntraseña:" @@ -5827,7 +5820,7 @@ msgstr "Asignar a esta ciudad" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Cargar" @@ -6065,8 +6058,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6242,7 +6235,7 @@ msgstr[0] "Seguro que quiere desarticular %1 unidad?" msgstr[1] "Seguro que quiere desarticular estas %1 unidades?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6258,7 +6251,7 @@ msgid "Yes" msgstr "Sí" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6345,12 +6338,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Este es el cliente Qt de Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "No Observar" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Observar" @@ -6384,7 +6377,7 @@ "después de '--'. Consulta la documentación de Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Salir?" @@ -6535,9 +6528,9 @@ msgid "Game" msgstr "Partida" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opciones" @@ -6562,8 +6555,8 @@ msgid "Leave game" msgstr "Abandonar la partida" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6822,7 +6815,7 @@ msgstr "Impuestos..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Jugadores" @@ -6870,7 +6863,7 @@ msgid "... read more in help" msgstr "... lee más en la ayuda" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Refrescar" @@ -6880,123 +6873,117 @@ msgstr "Aplicar" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, cliente Qt" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "commit: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "cliente Qt" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), cliente Qt" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Empezar una nueva partida" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Empezar un escenario" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Cargar una partida guardada" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Conectar con un juego en red" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Conectar" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Usuario" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Contraseña" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Confirme Contraseña" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Servidores de Internet:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Servidores locales:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Fecha" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Navegar..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Cargar un Escenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Líder" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Desconectar" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Comenzar" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Guardar ficheros" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Cargar fichero guardado" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Ficheros de Escenarios" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Abrir fichero de Escenario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Observadores Globales" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "No preparado" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Asignar el nivel de dificultad" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Poner en equipo" @@ -7099,7 +7086,7 @@ msgid "Back" msgstr "Volver" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Cargar partida" @@ -8228,44 +8215,38 @@ msgstr "Añadir lista de tareas" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "cliente %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Empezar una nueva partida" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Unirse a una partida" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Conectar con servidor público" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Unirse a un servidor LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "El cliente SDL te da la bienvenida..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Commit: %s" @@ -15361,83 +15342,83 @@ msgid "?unitflag:Hunter" msgstr "Cazador" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versión %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versión beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versión %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versión %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versión beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versión " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Enero" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Febrero" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Marzo" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Abril" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mayo" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Junio" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Julio" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Agosto" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Septiembre" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Octubre" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Noviembre" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Diciembre" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15446,7 +15427,7 @@ "ESTA ES UNA VERSIÓN BETA\n" "Freeciv %s será publicado en %s, en %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15455,7 +15436,7 @@ "ESTA ES UNA VERSIÓN BETA\n" "Freeciv %s será publicado en %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "¡Porque la civilización debería ser libre!" @@ -16388,61 +16369,61 @@ "Cada recaudador de impuestos produce dos monedas de oro adicionales para tu " "tesorería por turno." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Europeo" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Clásico" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropical" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Asiático" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babilónico" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Celta" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renacentista" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industrial" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Moderno" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Posmoderno" @@ -18261,18 +18242,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "verde" @@ -19049,14 +19030,14 @@ "terminarla en un solo turno!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Jefe Bárbaro" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21063,9 +21044,9 @@ "Los Exploradores son unidades valientes que son muy útiles para explorar un " "territorio desconocido." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21498,8 +21479,8 @@ "Cada recaudador de impuestos produce tres monedas de oro adicionales para tu " "tesorería por turno." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Electricidad" @@ -21962,13 +21943,19 @@ 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." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Sólo los bárbaros pueden construir esto.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -23763,7 +23750,7 @@ #: data/civ2civ3/units.ruleset:447 msgid "Migrants" -msgstr " Migrantes" +msgstr "Migrantes" #: data/civ2civ3/units.ruleset:479 msgid "" @@ -31423,19 +31410,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Desconocida" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "No instalado" @@ -31491,11 +31478,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Instalador de modpacks de Freeciv (versión de línea de comandos)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Se ha instalado correctamente el Modpack" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Falló la instalación del Modpack: %s" @@ -31527,7 +31514,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Instalar automáticamente el modpack desde la URL dada" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31535,7 +31522,7 @@ "Se está instalando un modpack.\n" "Seguro que quiere salir?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Otra descarga ya está activa" @@ -31543,7 +31530,7 @@ msgid "Failed to start downloader" msgstr "Error al iniciar la descarga" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31552,40 +31539,40 @@ "%s%s\n" "commit: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Instalado" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Tipo" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Subtipo" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Licencia" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Instalar modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL de Modpack" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Elige qué modpack se instalará" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31596,11 +31583,11 @@ "después de '--'. Consulta la documentación de Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Instalador de modpacks de Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Instalador de modpacks de Freeciv (gtk3)" @@ -31890,209 +31877,209 @@ msgid "A poorly-named city" msgstr "Una ciudad con mal nombre" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Tu %s se ha establecido en la ciudad de %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "Los %s ya tienen un %s. No se pueden transferir el tuyo." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Se ha transferido %s de %s desde los %s a los %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Se ha transferido %s desde los %s a los %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "Perdido un %2$s %1$s en la transferencia a %4$s %3$s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Has perdido %s con la toma de %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Un %s de reemplazo fue construido en %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "Ya tienes una ciudad llamada %s. Así que su nombre se ha cambiado a %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "¡La población de %s está maravillada de tu nivel tecnológico!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Los obreros se reúnen espontáneamente y actualizan %s con %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Los obreros se reúnen espontáneamente y actualizan los caminos de %s." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Los obreros se reúnen espontáneamente y actualizan las bases de %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Has fundado %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Se ha movido tu %s a fuera de la ciudad abandonada %s porque no puede estar " "en %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Cuando se abandonó %s, tu %s no pudo salir, y se quedó varado." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Cuando se desmanteló %s, tu %s en %s quedó atrapado, y por tanto se perdió." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Destruyes %s por completo." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%2$s ha destruido %1$s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "¡Conquistas %s, y consigues un botín de %d monedas de oro!" msgstr[1] "¡Conquistas %s, y consigues un botín de %d monedas de oro!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s ha conquistado %s y ha conseguido un botín de %d monedas de oro." msgstr[1] "%s ha conquistado %s y ha conseguido un botín de %d monedas de oro." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Has conquistado %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s ha conquistado %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "¡Has liberado %s! Consigues un botín de %d monedas de oro." msgstr[1] "¡Has liberado %s! Consigues un botín de %d monedas de oro." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s ha liberado %s y ha conseguido un botín de %d monedas de oro." msgstr[1] "%s ha liberado %s y ha conseguido un botín de %d monedas de oro." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "¡Has liberado %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s ha liberado %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "El comercio entre %s y %s se ha perdido junto con la ciudad." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "La ruta comercial entre %s y %s ha sido cancelada." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" "El comercio entre la ciudad %s %s y %s se ha perdido junto con su ciudad." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" "Lo siento, los %s han cancelado la ruta comercial de %s a tu ciudad %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Hemos cancelado la ruta comercial desde %s a la ciudad %s %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " de la lista de tareas" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s está produciendo %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vendes %s en %s (ahora en tierra) por %d moneda de oro." msgstr[1] "Vendes %s en %s (ahora en tierra) por %d monedas de oro." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "El tamaño del mapa de la ciudad de %s se ha %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "incrementado" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "reducido" @@ -32377,91 +32364,92 @@ msgid "The %s have started building a spaceship!" msgstr "¡Los %s han empezado a construir una nave espacial!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s no puede producir aún %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Puede construir nuevas ciudades(población inicial %d).\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s ha terminado de producir %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "Tu %s cuesta %d punto de población. %s se reduce a tamaño %d." msgstr[1] "Tu %s cuesta %d puntos de población. %s se reduce a tamaño %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" "¡No hay suficiente dinero para mantener %s en %s, se vende el edificio!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "No hay suficiente oro. Se desarticula %s." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Contaminación cerca de %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Celebraciones a lo grande en tu honor en %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Celebraciones canceladas en %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s ha sido alcanzado por una plaga! Se ha perdido población!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Disturbios en %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "SIGUE HABIENDO DISTURBIOS en %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Se ha restablecido el orden público en %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "El pueblo ha derrocado a tu %s, tu nación está sumida en revueltas." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s no puede producir %s todavía, y no podemos abandonar nuestra única ciudad." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "Se abandona %s; sus habitantes ahora son %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32470,7 +32458,7 @@ "disponible!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32480,7 +32468,7 @@ "disponible!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32490,7 +32478,7 @@ "disponible!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32499,7 +32487,7 @@ "crecer!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32508,7 +32496,7 @@ "crecer!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32516,72 +32504,72 @@ "Migrantes de %s (%s) no puede ir a %s, porque necesita una instalación para " "crecer!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "Los habitantes de %s abandonan su ciudad." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Migrantes de %s se trasladan a %s en busca de una vida mejor." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Migrantes de %s se trasladan a %s (%s) en busca de una vida mejor." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Migrantes de %s (%s) se trasladan a %s en busca de una vida mejor." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%s ha padecido un %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Contaminación nuclear cerca de %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s ha reducido la población de %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s ha destruido %s en %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Todo la comida almacenada ha sido destruida en %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "La producción de %s en %s ha sido destruida." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" "Ciudadanos de %s están pensando en emigrar a %s para tener una vida mejor." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34577,32 +34565,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Han capturado a tu %s después de completar su misión." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Has causado un incidente al sobornar al %2$s %1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s ha causado un incidente al sobornar a tu %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Has causado un incidente al intentar robar tecnología a los %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s ha causado un incidente al intentar robarte tecnología." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Has causado un incidente al incitar una rebelión en %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "Los %s ha causado un incidente al provocar una rebelión en %s." @@ -34987,19 +34975,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "La duración máxima del turno es negativa, quedará a cero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "El servidor no pudo asignar las posiciones de partida." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 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:2472 +#: server/generator/mapgen.c:2473 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:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "El generador 3 ha dejado %li masas terrestres sin colocar." @@ -35187,12 +35175,12 @@ "Los obreros se reúnen espontáneamente y actualizan todas las ciudades " "posibles con mejores bases." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Tu %s se ha movido al transformar el terreno." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Se desarticula a tu %s al transformar el terreno." @@ -35873,8 +35861,8 @@ "sucediera algún error durante la grabación. Si continúas puede que Freeciv " "no funcione correctamente." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -38794,7 +38782,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "La tregua con %s se ha acabado. Ahora estás en guerra con los %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"La tregua entre %s y %s se ha acabado. Se han declarado la guerra. Así que " +"tu cancelas la alianza con ellos dos." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38803,53 +38800,53 @@ "La tregua entre %s y %s se ha acabado. Se han declarado la guerra. Así que " "tu cancelas la alianza con ellos dos." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Se han colocado automáticamente las partes de la nave espacial que aún no " "estaban colocadas." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Tipo de compresión no soportada %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Error salvando la partida en el fichero %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Partida salvada en el fichero %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "La partida ya está en marcha." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Empezando la partida." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "solicitud de informe desconocido (tipo %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Aviso: rechazando cliente antiguo %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38857,53 +38854,53 @@ "Tu cliente es muy antiguo. Para usar este servidor, actualiza tu cliente a " "la Freeciv versión 2.2 o posterior." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "No se te permite editar." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "La nación %s no está disponible para que la seleccione un usuario." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "La nación %s está en uso." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s es %s, el gobernante %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "se ha solicitado más que el ajuste 'maxplayers'" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "no hay suficientes naciones jugables en este nationset (consulta ajuste " "'nationset')" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "no hay suficientes naciones jugables" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s gobierna a los %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -38911,35 +38908,35 @@ "Este programa servidor de Freeciv tiene soporte para autentificación de " "jugadores, pero no se está usando actualmente." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Enviando información al metaservidor <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" "No se reinicia sin haber solicitado expresamente una conexión al metaserver ." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "¡La partida ha finalizado!" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "No se pudo crear un mapa adecuado, se volverá a intentar con otro mapseed" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "No se puede crear un mapa adecuado con los ajustes proporcionados." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "El ajuste '%s' ha sido cambiado de %s a %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Aceptando ahora nuevas conexiones de clientes en el puerto %d." @@ -40826,18 +40823,18 @@ msgid "%s acquire %s as a result of learning %s." msgstr "Los %s obtienen %s como resultado del aprendizaje de %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Insuficiente producción científica. Hemos perdido la Tecnología Futura %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Insuficiente producción científica. Hemos perdido %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -40846,7 +40843,7 @@ "La tecnología necesaria para nuestro gobierno '%s' se ha perdido. Los " "ciudadanos han comenzado una revolución hacia '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -40855,32 +40852,32 @@ "La tecnología necesaria para nuestro nuevo gobierno '%s' se ha perdido. Los " "ciudadanos eligen '%s' como el nuevo gobierno objetivo." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s no puede construir %s. La tecnología necesaria se perdió." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "La meta tecnológica es %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Has robado %s a los %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "¡Los %s te han robado %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Los %s han robado %s a los %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -41806,6 +41803,18 @@ msgid "error %d (compiled without strerror)" msgstr "error %d (se ha compilado sin strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), cliente %s" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), cliente Qt" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s no puede producir aún %s." + #~ msgid "LAN" #~ msgstr "Red Local" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/et.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/et.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/et.po freeciv-2.5.8/translations/freeciv/et.po --- freeciv-2.5.7/translations/freeciv/et.po 2017-05-13 12:07:50.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/et.po 2017-08-12 11:54:35.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: et\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:51+0300\n" "Last-Translator: Elmo Todurov \n" "Language-Team: eesti\n" @@ -336,12 +336,12 @@ "*%s (AI)* %s ründavad meid barbaarselt ja me vajame te abi! Austa meie " "kuulsat liitu ja su nime ei unustata kunagi!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s on lõpetanud %s ehitamise linnas %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s on alustanud %s ehitamist linnas %s." @@ -373,7 +373,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -771,13 +771,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1899,10 +1899,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Lipp" @@ -2636,7 +2636,7 @@ msgstr "Mis rahvusest sa oled?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Vali rahvus" @@ -3302,16 +3302,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nimi" @@ -3434,11 +3434,11 @@ msgstr "Rahvused" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tüüp" @@ -3613,9 +3613,9 @@ msgid "Seen (Invis)" msgstr "Vali üksus(ed)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Teadmata" @@ -3737,7 +3737,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Teata vigadest aadressile %s.\n" @@ -3761,7 +3761,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4141,12 +4141,12 @@ msgid "Load Lua Script" msgstr "_Lae üksus" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Raja uus linn" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4179,8 +4179,8 @@ msgid "Set local options" msgstr "Määra kohalikke seadeid" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Mängu seaded" @@ -4592,8 +4592,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Alusta uut s_tsenaariumi" @@ -4986,7 +4986,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "See käsk on ainult kliendile." @@ -4997,7 +4997,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5005,372 +5005,365 @@ "%s client" msgstr "See käsk on ainult kliendile." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "See käsk on ainult kliendile." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Alusta uut mängu" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Lae _salvestatud mäng" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Ühendu _võrgumängu" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Ühendu Gaming _Zone'sse" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Vali koht salvestamiseks" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "Lehitse..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Paroolid ei kattu, sisesta parool." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Serveri nimi" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versioon" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Staatus" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Mängijaid" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "inimene" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Kommentaar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Kohtvõrk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Interneti _metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "K_asutajanimi:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Parool:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Kinnita _parool:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Ühendu" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Ühenduse nimi: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Mängija nimi: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Masin: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Mängija/ühenduse info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Lülita mängija valmidust" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Vali rahvus" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Vaatle seda mängijat" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Vali see mängija" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Katkesta ühendus" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Lülita tehismõistusele" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Eemalda mängija" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Anna käsutase info " #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Lisa %s hulka" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Pole _valmis" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Valmis" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Alusta" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Vali see mängija" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Vali _Rahvus" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Vali see mängija" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Pealtvaataja: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Vaatle" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Ära _vaatle" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Juhuslik" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Vaatleja" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Lahti ühenduund" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Mängijate arv (tehismõistus kaasa arvatud):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_Tehisintellekti tase:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Kõrb" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Rohkem mängu_seadeid..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Salvesta" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Reiting" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Valmis" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?Player:Nimi" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Meeskond" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Vali salvestatud mäng laadimiseks" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Vali salvestatud mäng _laadimiseks:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Vali stsenaarium" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Vali _stsenaarium:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Salvestise _failinimi:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Salvesta mäng" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Salvestatud mängud:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Salvestise _failinimi:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Salvesta mäng" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Salvestatud mängud:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Salvestatud mängud:" @@ -5905,7 +5898,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Parool:" @@ -5945,7 +5938,7 @@ msgstr "Tee uueks kodulinnaks" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Lae" @@ -6220,8 +6213,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6410,7 +6403,7 @@ msgstr[0] "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis." msgstr[1] "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis." -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6426,7 +6419,7 @@ msgid "Yes" msgstr "Jah" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6514,13 +6507,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Klient Freecivile" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Ära _vaatle" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Vaatle" @@ -6554,7 +6547,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Välju" @@ -6727,9 +6720,9 @@ msgid "Game" msgstr "Mäng" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Seaded" @@ -6758,8 +6751,8 @@ msgid "Leave game" msgstr "Lahku mängust" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7047,7 +7040,7 @@ msgstr "Maksumäär..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7100,7 +7093,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Värskenda" @@ -7111,143 +7104,137 @@ msgstr "Kehtib vaid korra" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "See käsk on ainult kliendile." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Üksused: " -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "See käsk on ainult kliendile." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "See käsk on ainult kliendile." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Alusta uut mängu" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Lae salvestatud mäng" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Ühendu _võrgumängu" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Ühenda" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Kasutajanimi:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Parool:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Kinnita _parool:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Interneti _metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Vaatleja" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "Lehitse..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Juhtija:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Katkesta ühendus" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Alusta" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Vali see mängija" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Salvestise _failinimi:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Alusta uut s_tsenaariumi" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Vaatleja" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Pole _valmis" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", raskusaste %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Lisa %s hulka" @@ -7359,7 +7346,7 @@ msgid "Back" msgstr "Tagasi" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Lae mäng" @@ -8512,44 +8499,38 @@ msgstr "Uus töödenimekiri" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versioon %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "See käsk on ainult kliendile." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Alusta uut mängu" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Ühine mänguga" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Ühine avaliku serveriga" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Ühine LANi serveriga" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Tervitus SDLClient poolt..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Linn %s" @@ -15523,83 +15504,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versioon %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beetaversioon)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versioon %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versioon %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "beetatest versioon " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versioon " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Jaanuar" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Veebruar" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Märts" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Aprill" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mai" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juuni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juuli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "August" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "September" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktoober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Detsember" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15609,7 +15590,7 @@ "Freeciv %s valmib\n" "%s, vt %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15619,7 +15600,7 @@ "Freeciv %s valmib\n" "%s, vt %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Sest tsivilisatsioon peaks vaba olema!" @@ -16507,61 +16488,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:euroopalik" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klassikaline" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Troopiline" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Aasia" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Baüloonia" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Keldi" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renessanss" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Tööstuslik" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Kaasaegne" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Postmodernism" @@ -18360,18 +18341,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "roheline" @@ -19012,14 +18993,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarite pealik" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20898,9 +20879,9 @@ "territory." msgstr "Rändur on väga kasulik kaardistamata territooriumi avastamiseks." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21310,8 +21291,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:Keldi" @@ -21730,13 +21711,18 @@ "See oled sina. Kui sa selle üksuse kaotad, oled mängu kaotanud. Nii et ära " "kaota!" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "LHKS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29580,20 +29566,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Teadmata" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29648,12 +29634,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Vali teadus, mida varastada" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s edukalt transporditud." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29685,14 +29671,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis." -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29701,60 +29687,60 @@ msgid "Failed to start downloader" msgstr "Viga uue AI mängija %s loomisel" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Vali teadus, mida varastada" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Vali teadus, mida varastada" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Vali teadus, mida varastada" @@ -30032,206 +30018,206 @@ msgid "A poorly-named city" msgstr "Halvasti nimetatud linn" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "%s uus kodulinn on %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s %s-s liigutati %s-lt %s-le." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s liigutati %s-lt %s-le." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "Rahva %s %s läks kaduma üleviimisel rahva %s linna %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s kaotatud koos kontrolliga linna %s üle." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Uus %s rajati linna %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Sul on juba linn nimega %s. Linn nimetati ümber %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "%s elanikud on meeletus vaimustuses su tehnotaibust!\n" " Töötajad spontaanselt koguneved ja sutsti! uuendavad linna raudteedega." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Sa rajasid linna %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Viisin %s välja laiali saadetavast linnast %s, et ta kuivale ei jääks." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Kui %s saadeti laiali, su %s ei suutnud välja saada ja hukkus." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "Kui %s saadeti laiali, su %s ei suutnud välja saada ja hukkus." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Sa hävitasid linna %s täielikult." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Linna %s hävitas %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Vallutasid linna %s. Saagiks said %d raha!" msgstr[1] "Vallutasid linna %s. Saagiks said %d raha!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s vallutasid %s ja said %d raha linnast saagiks." msgstr[1] "%s vallutasid %s ja said %d raha linnast saagiks." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Vallutasid %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s vallutasid %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Vabastasid oma linna %s! Saagiks %d raha." msgstr[1] "Vabastasid oma linna %s! Saagiks %d raha." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s vabastas %s ja röövis linnast %d raha." msgstr[1] "%s vabastas %s ja sai linnast %d raha." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Sa vabastasid linna %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s vabastas %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Kahjuks katkestas %s kaubatee linnast %s sinu linna %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Kahjuks katkestas %s kaubatee linnast %s sinu linna %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " tööde nimekirjast" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s ehitab %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Linn %s (nüüd ilma merele pääsuta) müüb %s %d raha eest." msgstr[1] "Linn %s (nüüd ilma merele pääsuta) müüb %s %d raha eest." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%s rahvusel %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Lennubaas" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30514,97 +30500,98 @@ msgid "The %s have started building a spaceship!" msgstr "%s alustasid kosmoselaeva ehitamist!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s ei saa veel ehitada üksust %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Saab ehitada uusi linnu.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s sai valmis %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Pole raha, et käigus hoida %s linnas %s, ehitis müüdud!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Raha on otsakorral. %s saadeti laiali" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Saast linna %s lähedal." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Metsikud peod sinu auks linnas %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Pidu linnas %s jäeti ära." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Rahutused linnas %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "RAHUTUSED JÄTKUVAD linnas %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Kord taastatud linnas %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Rahvas on su %s kukutanud, riigis lokkab mäss." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s ei saa veel %s't ehitada, ja me ei saa oma ainsat linna laiali saata." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s saadeti laiali %s'ks." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30612,7 +30599,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30620,91 +30607,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s saadeti laiali %s'ks." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s sai pihta %s tuumapommiga." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Saast linna %s lähedal." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Näljahäda põhjustab rahvastiku vähenemise linnas %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s hävitas %s %s-is." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Su %s hävitas %s linnas %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%s tootmine uuendatud %s'ks %s-s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32560,32 +32547,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Su %s saadi kätte pärast ülesande täitmist." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Sa põhjustasid intsidendi üritades ära osta rahvuse %s üksust %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s põhjustas intsidendi, kui üritas osta ära su %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Sa põhjustasid intsidendi, kui üritasid varastada teadust %s-ilt." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s põhjustas intsidendi üritades varastada sult teadust." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Sa põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s." @@ -32909,19 +32896,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Käigu tegemise aeg on nullist väiksem, sean nulliks." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Massiivne maa - see võib võtta mõni sekund." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generaator 3 ei paigutanud kõiki suuri saari." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generaator 3 jättis %li maad paigutamata." @@ -33100,12 +33087,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Su %s nihutati, kuna maastik muutus." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Su %s lasti lahti, kuna maastik muutus." @@ -33784,8 +33771,8 @@ "Mängu salvestises on kaart mittetäielik. See saab juhtuda vanade " "salvestatud mängudega või on salvestis lihtsalt vigane. Jätka omal riisikol." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s liideti kui %s arvuti juhitud mängijana." @@ -36456,7 +36443,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Vaherahu %s'ga on lõpenud. Oled nüüd %s-ga sõjas." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Vaherahu %s ja %s vahel on lõppenud. Nad on nüüd sõjas. Sa katkestad liidu " +"mõlemaga." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36465,98 +36461,98 @@ "Vaherahu %s ja %s vahel on lõppenud. Nad on nüüd sõjas. Sa katkestad liidu " "mõlemaga." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "toetatud seaded: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Ei suutnud salvestada mängu faili %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Mäng salvestati faili %s." -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Mäng juba käib." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Alustame mänguga." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "küsiti tundmatut raportit (tüüp %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Hoiatus: ei luba sisse vana klienti %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Sa ei tohi seda seadet muuta." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Rahvus %s ei ole saadaval selles stsenaariumis." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Rahvus %s on juba kasutuses." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s on rahvuse %s valitseja %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s on %s valitseja." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 #, fuzzy msgid "" "This freeciv-server program has player authentication support, but it's " @@ -36565,34 +36561,34 @@ "See civserver'i programm toetab mängijate autentimist, kuid see pole hetkel " "kasutuses." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Saadan infot metaserverile [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Mäng on läbi..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Mäng: Sa ei saa selle rahvuse üksust ära osta." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Seade: %s seati \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Ootan klientprogrammide ühendusi." @@ -38436,56 +38432,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Suurendab linna teadustööd 50% võrra." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Tehnoloogiline eesmärk on %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Varastad %s %s-telt." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s varastasid sult %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s varastasid tehnoloogia %s rahvuselt %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39395,6 +39391,21 @@ msgstr "viga %d (kompileeritud ilma strerror'ita)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "See käsk on ainult kliendile." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "See käsk on ainult kliendile." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versioon %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ei saa veel ehitada üksust %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/fa.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/fa.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/fa.po freeciv-2.5.8/translations/freeciv/fa.po --- freeciv-2.5.7/translations/freeciv/fa.po 2017-05-13 12:07:50.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/fa.po 2017-08-12 11:54:35.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Arman Ordookhani \n" "Language-Team: Farsi(Persian)\n" @@ -288,12 +288,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s ساخت %s در %s را متوقف کردند." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s ساخت %s در %s را شروع کردند." @@ -325,7 +325,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -723,13 +723,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1836,10 +1836,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "پرچم" @@ -2571,7 +2571,7 @@ msgstr "چه ملیتی می‌خواهید باشید؟" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "انتخاب ملیت" @@ -3239,16 +3239,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "نام" @@ -3368,11 +3368,11 @@ msgstr "ملل" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "نوع" @@ -3546,9 +3546,9 @@ msgid "Seen (Invis)" msgstr "انتخاب مهره(ها)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "ناشناخته" @@ -3670,7 +3670,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "اشکالات را به <%s> گزارش دهید.\n" @@ -3694,7 +3694,7 @@ msgstr "شیفت+اینتر" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4074,12 +4074,12 @@ msgid "Load Lua Script" msgstr "سوار کردن مهره" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "ساختن شهر جدید" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4109,8 +4109,8 @@ msgid "Set local options" msgstr "تغییر تنظیمات محلی" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "تنظیمات بازی" @@ -4523,8 +4523,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "شروع بازی سناریو" @@ -4913,7 +4913,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "این دستور فقط از Client قابل اجراست." @@ -4924,7 +4924,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4932,374 +4932,367 @@ "%s client" msgstr "این دستور فقط از Client قابل اجراست." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "این دستور فقط از Client قابل اجراست." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "شروع بازی جدید" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "شروع بازی سناریو" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "شروع بازی ذخیره شده" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "وصل شدن به بازی شبکه" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "محل ذخیره را انتخاب کنید" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "گشتن..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "رمز عبور مطابقت نمی‌کند.رمز را وارد کنید." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "نام سرور" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "پرت" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "نسخه" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "وضعیت" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "بازیکنان" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "انسان" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "توضیح" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "شبکه محلی" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "اینترنت" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "میزبان:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "پرت:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "نام کاربری:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "رمز:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "تکرار رمز:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "اتصال" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "نام اتصال: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "نام بازیکن: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "میزبان: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "اطلاعات بازیکن/اتصال" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "اطلاعات %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "تغییر آمادگی بازیکن" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "انتخاب ملیت" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "ناظر کردن این بازیکن" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "انتخاب این بازیکن" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "بریدن اتصال" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "تغییر هوش‌مصنوعی بازیکن" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "برداشتن بازیکن" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "دادن دسترسی اطلاعات" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "گذاشتن به %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "نا آماده" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "آماده" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "شروع" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "خانه %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "انتخاب ملیت" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "انتخاب این بازیکن" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "ناظر: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "ناظر" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "نا ناظر" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "<ه‌م آسان>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "تصادفی" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "ناظر" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "جدا شده" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "تعداد بازیکنان (با هوش‌مصنوعی)" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "سطح بازی هوش‌مصنوعی:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "بیابان" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "تنظیمات دیگر..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "رکورد" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "درجه" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "آماده" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "نام" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "تیم" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "یک سناریو انتخاب کنید" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "یک سناریو انتخاب کنید:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "نام فایل ذخیره:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "ذخیره بازی" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "بازی‌های ذخیره شده:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "نام فایل ذخیره:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "شروع بازی سناریو" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "شروع بازی سناریو" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "ذخیره بازی" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "بازی‌های ذخیره شده:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "بازی‌های ذخیره شده:" @@ -5834,7 +5827,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "رمز:" @@ -5874,7 +5867,7 @@ msgstr "شهر خانه جدید" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "سوار کردن" @@ -6149,8 +6142,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6338,7 +6331,7 @@ msgstr[0] "آیا مطمئنید که می‌خواهید خارج شود؟" msgstr[1] "آیا مطمئنید که می‌خواهید خارج شود؟" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6354,7 +6347,7 @@ msgid "Yes" msgstr "بله" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6442,13 +6435,13 @@ msgid "This is Qt-client for Freeciv." msgstr "" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "نا ناظر" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "ناظر" @@ -6482,7 +6475,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "خروج" @@ -6651,9 +6644,9 @@ msgid "Game" msgstr "یازی" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "" @@ -6682,8 +6675,8 @@ msgid "Leave game" msgstr "ذخیره بازی" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6969,7 +6962,7 @@ msgstr "درجه مالیات..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7022,7 +7015,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "نوسازی" @@ -7032,142 +7025,136 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "این دستور فقط از Client قابل اجراست." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "مهره %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "این دستور فقط از Client قابل اجراست." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "این دستور فقط از Client قابل اجراست." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "شروع بازی جدید" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "شروع بازی سناریو" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "شروع بازی ذخیره شده" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "وصل شدن به بازی شبکه" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "نام کاربری:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "رمز:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "تکرار رمز:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "اینترنت" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "ناظر" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "گشتن..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "شروع بازی سناریو" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "رهبر:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "قطع" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "شروع" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "انتخاب این بازیکن" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "نام فایل ذخیره:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "شروع بازی سناریو" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "شروع بازی سناریو" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "ناظر" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "نا آماده" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "گذاشتن به %s" @@ -7279,7 +7266,7 @@ msgid "Back" msgstr "" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "بارگذاری بازی" @@ -8421,46 +8408,40 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv نسخه %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "این دستور فقط از Client قابل اجراست." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "شروع بازی جدید" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "نام کاربری" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " (ناظر)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "شهر %s" @@ -15233,83 +15214,83 @@ msgid "?unitflag:Hunter" msgstr "هلیکوپتر" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv نسخه %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(نسخه بتا)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv نسخه %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv نسخه %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "نسخه بتا تست" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "نسخه " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "ژانویه" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "فوریه" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "مارس" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "آوریل" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "می" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "جون" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "ژویه" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "آگوست" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "سپتامر" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "اکتبر" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "نوامبر" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "دسامبر" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15319,7 +15300,7 @@ "Freeciv %s در ماه %s\n" "در %s منتشر می‌شود." -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15329,7 +15310,7 @@ "Freeciv %s در ماه %s\n" "در %s منتشر می‌شود." -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "" @@ -16162,61 +16143,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "اروپایی" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "كلاسيك" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "گرمسیری" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "آسیایی" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "بابلی" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "سلتیکی" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "رنسانس" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "صنعتی" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "مدرن" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "پست مدرن" @@ -17905,18 +17886,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "تازه‌کار" @@ -18542,14 +18523,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "رهبر بیگانگان" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20304,9 +20285,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20691,8 +20672,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "سلتیکی" @@ -21084,13 +21065,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "سيسنم كنترل هوايي" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -27905,20 +27891,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "ناشناخته" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -27973,11 +27959,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "تکنولوژی را که می‌خواهید بدزدید انتخاب کنید" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28009,14 +27995,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "آیا مطمئنید که می‌خواهید خارج شود؟" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -28025,60 +28011,60 @@ msgid "Failed to start downloader" msgstr "شما به هیچ بازیکنی وصل نیستید." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "تکنولوژی را که می‌خواهید بدزدید انتخاب کنید" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "تکنولوژی را که می‌خواهید بدزدید انتخاب کنید" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "تکنولوژی را که می‌خواهید بدزدید انتخاب کنید" @@ -28348,204 +28334,204 @@ msgid "A poorly-named city" msgstr "" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "شهر خانه %s به %s تغییر کرد." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s را از %s به %s تبدیل کرد." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s از %s بر اثر تبدیل %s %s از بین رفت." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "یک %s جدید در %s ساخته شد." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "شما شهری با نام %s دارید.نام شهر به %s تغییر یافت." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "شما %s را پیدا کردید." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "شما %s را به کلی خراب کردید." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s توسط %s خراب شد." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "شما %s را فتح کردید و %d طلا از آنجا غارت کردید." msgstr[1] "شما %s را فتح کردید و %d طلا از آنجا غارت کردید." -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s %s را فتح کرد و %d طلا از شهر غارت کرد." msgstr[1] "%s %s را فتح کرد و %d طلا از شهر غارت کرد." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "%s %s را فتح کرد." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s %s را فتح کرد." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "%s را از %s به %s تبدیل کرد." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " از لیست‌کار" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "شهر %s در حال ساخت %s%s است." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "شما %s را در %s (اکنون در خشکی محاط شده) با %d طلا فروختید." msgstr[1] "شما %s را در %s (اکنون در خشکی محاط شده) با %d طلا فروختید." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%s %s (%s(" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "پایگاه هوایی" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -28793,96 +28779,97 @@ msgid "The %s have started building a spaceship!" msgstr "" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "شهر %s نمی‌تواند %s را بسازد." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* می‌تواند شهر جدید بسازد.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "شهر%s ساختن %s را تمام کرد." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "شهر %s نمی‌تواند از %s نگهداری کند، مهره منحل شد." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "آلودگی کنار %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "دیدار با %s لغو شد." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "شهر %s مختل شده." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "اختلال‌ل در %s ادامه دارد." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "شهر %s از اختلال برگشت." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -28890,7 +28877,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -28898,91 +28885,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s شما توسط %s تطمیع شد." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s شما توسط %s تطمیع شد." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "آلودگی کنار %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "قحطی باعث کاهش جمعیت در %s شد." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "ناوشكن" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "شهر %s از اختلال برگشت." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "تولید %s به %s در %s ترفیع یافت." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30632,32 +30619,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s ساخت %s را در %s تمام کردند." @@ -30976,19 +30963,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -31148,12 +31135,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -31820,8 +31807,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s به عنوان بازیکن هوش‌مصنوعی سطح %s اضافه شد." @@ -34184,138 +34171,145 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "%s به متحد شما %s حمله کرد! شما اتحاد خود را با او لغو کردید." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "%s به متحد شما %s حمله کرد! شما اتحاد خود را با او لغو کردید." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "بازی با نام %s ذخیره شد" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "بازی از قبل اجرا شده است." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "در حال شروع بازی" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "شما به هیچ بازیکنی وصل نیستید." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s حاکم %s، %s است." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s بر %s حکومت می‌کند." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "بازی تمام شد..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "نمی‌توان روی این خانه مهره‌ی %s ساخت." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "تنظیمات: %s به %d تغییر یافت." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -36103,56 +36097,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "تکنولوژی هدف %s است." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "شما %s را از %s دزدیدید." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s %s را از شما دزدیدند!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s %s را از %s دزدیده بود." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -37043,6 +37037,21 @@ msgstr "" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "این دستور فقط از Client قابل اجراست." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "این دستور فقط از Client قابل اجراست." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv نسخه %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "شهر %s نمی‌تواند %s را بسازد." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/fi.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/fi.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/fi.po freeciv-2.5.8/translations/freeciv/fi.po --- freeciv-2.5.7/translations/freeciv/fi.po 2017-05-13 12:07:51.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/fi.po 2017-08-12 11:54:36.000000000 +0000 @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: freeciv 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2016-12-22 13:52+0200\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-07-17 00:59+0300\n" "Last-Translator: Markus Linnakangas \n" "Language-Team: None \n" "Language: fi\n" @@ -372,12 +372,12 @@ "*%s (AI)* %s on hyökännyt julmasti kimppuumme ja tarvitsemme apuanne! " "Kunnioittakaa mahtavaa liittoamme ja nimeänne kunnioitetaan iäti!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s ovat keskeyttäneet hankkeensa %s kaupungissa %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s tavoittelevat taivaita: %s rakenteilla kaupungissa %s." @@ -414,7 +414,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -807,13 +807,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1927,10 +1927,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Lippu" @@ -2653,7 +2653,7 @@ msgstr "Mitä kansakuntaa haluat johtaa?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Kansakunnan valinta" @@ -3314,16 +3314,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nimi" @@ -3434,11 +3434,11 @@ msgstr "Kansakunnat" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tyyppi" @@ -3611,9 +3611,9 @@ msgid "Seen (Invis)" msgstr "Nähty (Näkymätön)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Tuntematon" @@ -3735,7 +3735,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Ilmoita ohjelman virheistä osoitteessa %s\n" @@ -3759,7 +3759,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Näkymä" @@ -4132,12 +4132,12 @@ msgid "Load Lua Script" msgstr "Lataa Lua-skripti" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Perusta uusi kaupunki" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4166,8 +4166,8 @@ msgid "Set local options" msgstr "Muokkaa paikallisia asetuksia" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Pelin asetukset" @@ -4550,8 +4550,8 @@ msgid "Game/Scenario Properties" msgstr "Pelin/skenaarion ominaisuudet" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Tallenna skenaario" @@ -4916,7 +4916,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, käyttöliittymä %s" @@ -4927,7 +4927,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4938,267 +4938,260 @@ "revisiotunniste: %s\n" "käyttöliittymä %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), käyttöliittymä %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Aloita _uusi peli" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Aloita _skenaariopeli" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Lataa tallennettu peli" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Yhdistä verkkopeliin" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Y_hdistä pelialueelle" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Valitse sijainti johon tallennetaan" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Selaa..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Salasanat eivät täsmää, anna salasana." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Palvelimen nimi" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Portti" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versio" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Tila" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Pelaajia" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Ihmisiä" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Lisätiedot" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Paikallisverkko (_LAN)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet-metapalvelin" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Palvelin:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Portti:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "Kirjautumisnimi:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Salasana:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Vahv_ista salasana:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Palvelin" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Yhdistä" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Yhteyden nimi: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Pelaajan nimi: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Palvelin: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Pelaaja/yht-tiedot" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s-tiedot" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Vaihda pelaajan valmiustilaa" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Valitse kansakunta" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Tarkkaile tätä pelaajaa" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Ota tämä pelaaja" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Katkaise yhteys" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Vaihda pelaaja AI-hallintaan/hallinnasta" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Poista pelaaja" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Anna tason %s pääsy" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Liitä joukkueeseen %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "_Ei valmis" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Valmis" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Aloita" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Hallitse pelaajaa %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Valitse ka_nsakunta" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Hallitse pelaajaa" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "Tarkkaile pelaajaa %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Tarkkaile" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Älä _tarkkaile" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s AI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Satunnainen" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Tarkkailija" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Irrotettu" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5206,96 +5199,96 @@ "Pelaajamäärä,\n" "mukaanlukien AI-pelaajat:" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "AI:n vaikeus_taso:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Sääntökokoelma:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Enemmän peliasetuksia..." # (Guess... 17 Jan 09) -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Ennätys" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Luokitus" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Valmis" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Hallitsija" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Joukkue" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Valitse ladattava peli" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Valitse _ladattava peli:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Valitse skenaario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Valitse _skenaario" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Tiedostonimi:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Tallenna peli" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Tallennetut _pelit:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Tallenna _tiedostoon:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Tallennetut ske_naariot:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Tallenna sk_enaario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Tallenna karttakuva" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Tallennetut karttakuvat:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Tallenna karttakuvat:" @@ -5817,7 +5810,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Lisätietoa saa napauttamalla asukkaita%shiiren vasemmalla napilla." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Uusi _Salasana:" @@ -5854,7 +5847,7 @@ msgstr "Tee tästä uusi kotikaupunki" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Lastaa" @@ -6092,8 +6085,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6269,7 +6262,7 @@ msgstr[0] "Haluatko todella poistaa käytöstä %1 yksikön?" msgstr[1] "Haluatko todella poistaa käytöstä %1 yksikköä?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6285,7 +6278,7 @@ msgid "Yes" msgstr "Kyllä" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6372,12 +6365,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Freecivin Qt-pohjainen asiakasohjelma." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Älä tarkkaile" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Tarkkaile" @@ -6411,7 +6404,7 @@ "antamisen '--':n jälkeen. Lisätietoa saat Qt-dokumentaatiosta.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Lopeta" @@ -6562,9 +6555,9 @@ msgid "Game" msgstr "Peli" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Valinnat" @@ -6589,8 +6582,8 @@ msgid "Leave game" msgstr "Poistu pelistä" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6849,7 +6842,7 @@ msgstr "Verotus..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Pelaajat" @@ -6897,7 +6890,7 @@ msgid "... read more in help" msgstr "... lue lisää ohjeista" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Virkistä" @@ -6907,123 +6900,117 @@ msgstr "Käytä kerran" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, Qt-käyttöliittymä" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "revisiotunniste: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Qt-käyttöliittymä" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), Qt-käyttöliittymä" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Aloita uusi peli" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Aloita skenaariopeli" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Lataa tallennettu peli" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Yhdistä verkkopeliin" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Yhdistä" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Kirjautumisnimi" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Salasana" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Vahvista salasana:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Internet-palvelimet:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Paikalliset palvelimet:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Talletuspäivä" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Selaa..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Lataa skenaario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Hallitsija" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Katkaise yhteys" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Aloita" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Pelitallennukset" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Avaa tallennus" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Skenaariotallennukset" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Avaa skenaario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Koko pelin tarkkailijat" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Ei valmis" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Aseta vaikeusaste" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Liitä joukkueeseen" @@ -7126,7 +7113,7 @@ msgid "Back" msgstr "Palaa" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Lataa peli" @@ -8275,44 +8262,38 @@ msgstr "Lisää uusi työlista" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "käyttöliittymä %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Aloita uusi peli" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Liity peliin" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Liity julkiselle palvelimelle" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Liity LAN-palvelimelle" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL-asiakasohjelma toivottaa sinut tervetulleeksi..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "revisiotunniste: %s" @@ -15372,84 +15353,84 @@ # Remove 'version' as unnecessary and confusing, particularly when (beta # version) is included. -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta-versio)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "beta-kokeiluversio " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versio " # *** -kuu can be removed from months to produce shortenings. *** -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "tammikuu" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "helmikuu" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "maaliskuu" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "huhtikuu" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "toukokuu" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "kesäkuu" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "heinäkuu" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "elokuu" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "syyskuu" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "lokakuu" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "marraskuu" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "joulukuu" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15458,7 +15439,7 @@ "TÄMÄ ON BETA-VERSIO\n" "Freeciv %s ilmestyy %sssa, osoitteessa %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15468,7 +15449,7 @@ "Valmistuttuaan Freeciv %s ilmestyy osoitteessa %s" # *** free -> liberty *** -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Koska sivilisaation tulisi olla vapaa!" @@ -16383,61 +16364,61 @@ msgstr "" "Jokainen verottaja tuottaa joka vuoro kaksi lisäkultaa valtiosi kassaan." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Eurooppalainen" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Klassinen" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Trooppinen" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Aasialainen" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babylonialainen" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Kelttiläinen" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renessanssi" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Teollinen" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Moderni" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Postmoderni" @@ -18250,18 +18231,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "kokematon" @@ -19041,14 +19022,14 @@ "valmiiksi yhden vuoron aikana!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbaarijohtaja" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21045,9 +21026,9 @@ "Seikkailijat ovat rohkeita yksilöitä, jotka ovat erittäin hyödyllisiä " "tuntemattomien alueiden kartoituksessa." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21470,8 +21451,8 @@ msgstr "" "Jokainen veronkantaja tuottaa joka vuoro kolme kultaa lisää valtiosi kassaan." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Sähköaika" @@ -21929,13 +21910,18 @@ "Tämä yksikkö edustaa sinua. Häviät pelin jos menetät tämän yksikön; " "ymmärtänet miksi." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "Ei koskaan löydä majoista barbaareita." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "Tutkakone" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -31133,19 +31119,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Tuntematon" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Asentamaton" @@ -31201,11 +31187,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Muunnospaketin asennusohjelma (komentoriviversio)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Muunnospaketti on asennettu onnistuneesti" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Muunnospaketin asennus epäonnistui: %s" @@ -31237,7 +31223,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Automaattisesti asenna muunnospaketti annetusta osoitteesta" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31245,7 +31231,7 @@ "Muunnospaketin asentaminen meneillään.\n" "Haluatko todella lopettaa?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Toinen lataus on jo käynnissä" @@ -31253,7 +31239,7 @@ msgid "Failed to start downloader" msgstr "Lataimen käynnistys epäonnistui" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31262,40 +31248,40 @@ "%s%s\n" "revisiotunniste: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Asennettu" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Tyyppi" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Alityyppi" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Lisenssi" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Asenna muunnospaketti" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Muunnospaketin osoite" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Valitse asennettava muunnospaketti" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31305,11 +31291,11 @@ "antamisen '--':n jälkeen. Lisätietoa saat Gtk-dokumentaatiosta.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Muunnospaketin asennusohjelma (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Muunnospaketin asennusohjelma (gtk3)" @@ -31591,201 +31577,201 @@ msgid "A poorly-named city" msgstr "Huonosti nimetty kaupunki" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Yksikön %s kotikaupunki on nyt %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" "Yksikkösi %2$s omistusta ei voi siirtää, koska %1$s omistavat jo sellaisen." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Yksikkö %s siirretty kaupungissa %s pelaajalta %s pelaajalle %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Yksikkö %s siirretty pelaajalta %s pelaajalle %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s menetettiin kun sitä oltiin siirtämässä %s kaupunkiin %s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Kun menetit kaupungin %2$s hallinnan, menetit yksikön %1$s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Korvaava %s rakennettiin kaupunkiin %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "Sinulla on jo kaupunki nimeltään %s. Kaupungin uudeksi nimeksi tuli %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "Koko %s ihastelee millaista teknologiaa hallitset!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" "Työläiset päättävät kehittää kaupunkia %s. Talkoovoimin rakennetaan %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" "Työläiset päättävät kehittää kaupunkia %s. Talkoovoimin rakennetaan parhaat " "mahdolliset tiet." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" "Työläiset päättävät kehittää kaupunkia %s. Talkoovoimin rakennetaan parhaat " "mahdolliset tukikohdat." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Olet perustanut kaupungin %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Yksikkö %s poistui hylätystä kaupungista %s koska %s ei sovi sille." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Kun %s hylättiin, yksikkösi %s ei voinut poistua ja se menetettiin." # TODO: Need to play the game and see if the translation suits the situation -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Kun %s hylättiin, yksikkösi %s kaupungissa %s jäi ansaan ja se menetettiin." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Tuhoat kaupungin %s kokonaan." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Kaupunki %s on tuhottu, asialla oli %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Valloitat kaupungin %s, saaliisi on %d kulta!" msgstr[1] "Valloitat kaupungin %s, saaliisi on %d kultaa!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s valloitti kaupungin %s ja sai saaliikseen %d kultaa." msgstr[1] "%s valloitti kaupungin %s ja sai saaliikseen %d kultaa." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Valloitat kaupungin %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s valloitti kaupungin %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Olet vapauttanut kaupungin %s! Saaliisi on %d kulta." msgstr[1] "Olet vapauttanut kaupungin %s! Saaliisi on %d kultaa." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s vapautti kaupungin %s ja sai saaliikseen %d kullan." msgstr[1] "%s vapautti kaupungin %s ja sai saaliikseen %d kultaa." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Olet vapauttanut kaupungin %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s vapautti kaupungin %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" "Kauppareitti kaupunkien %s ja %s välillä on peruttu kaupungin menettämisen " "myötä." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Kauppareitti kaupunkien %s ja %s välillä on peruttu." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" "Kauppareitti %s kaupungin %s ja kaupungin %s välillä menetetty kaupungin " "myötä." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "%s on perunut kauppareitin kaupungista %s kaupunkiisi %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Peruimme kauppareitin kaupungista %s %s kaupunkiin %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " työlistalta" # Last %s is the source: worklist or AI advisor. Or empty. #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s aloitti hankkeen %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -31794,16 +31780,16 @@ msgstr[1] "" "Myyt vesiyhteyttä vaativan parannuksen %s kaupungissa %s %d kullasta." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Kaupungin %s alueen koko %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "laajeni" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "supistui" @@ -32073,78 +32059,81 @@ msgid "The %s have started building a spaceship!" msgstr "%s rakentavat jo avaruusalusta!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s ei voi vielä saada hanketta %s valmiiksi." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" +"%s ei voi vielä valmistaa yksikköä %s. (kaupungin koko: %d, yksikköön kuluva " +"väkiluku: %d)" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s sai valmiiksi hankkeensa %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s vaatii väestöä %d kokoluokan, %s kutistuu kokoon %d." msgstr[1] "%s vaatii väestöä %d kokoluokkaa, %s kutistuu kokoon %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "%s myyty kaupungissa %s, koska ylläpitoon ei ollut varaa!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Rahasi eivät riitä. %s hajotettiin." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "%s raportoi saasteista lähistöllään." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "%s järjestää villiä juhlintaa kunniaksesi." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "%s palaa arkeen, juhlallisuudet peruttu." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s on ruton riipimä! Väestöä kuolee!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "%s kärsii levottomuuksista." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "%s: LEVOTTOMUUDET JATKUVAT." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%s: Järjestys on palannut kaupunkiin." # government - e.g. Yksinvalta -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "%s kaatui kansannousussa, valtio natisee liitoksissaan." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32152,13 +32141,13 @@ "lakkauttaa." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s lakkautettiin, kun %s koottiin." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32167,7 +32156,7 @@ "syödään jo pettua!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32177,7 +32166,7 @@ "(%s) syödään jo pettua!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32187,7 +32176,7 @@ "%s syödään jo pettua!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32196,7 +32185,7 @@ "parannuksen kasvaakseen!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32205,7 +32194,7 @@ "vaatii parannuksen kasvaakseen!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32213,71 +32202,71 @@ "Siirtolaiset kaupungista %s (%s) eivät voi muuttaa, koska kohdekaupunki %s " "vaatii parannuksen kasvaakseen!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s on tyhjentynyt asukkaista." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Siirtolaisia kaupungista %1$s on saapunut kaupunkiin %2$s." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Siirtolaisia kaupungistasi %1$s on päätynyt %3$s kaupunkiin %2$s." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Siirtolaisia %2$s kaupungista %1$s on saapunut kaupunkiisi %3$s." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%2$s iski kaupunkiin %1$s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Ydinlaskeumaa lähellä kaupunkia %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s vähensi väkilukua kaupungissa %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s tuhosi kohteen %s kaupungissa %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Kaikki ruokavarastot tuhoutuivat kaupungissa %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "Kohteen %s tuotanto tuhoutui kaupungissa %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "%s ei houkuta. Sen asukkaat harkitsevat muuttoa kaupunkiin %s." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34260,32 +34249,32 @@ 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:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Olet aiheuttanut selkkauksen %s yksikön %s lahjontayrityksellä." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s on aiheuttanut selkkauksen lahjoessaan yksikköäsi %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Olet aiheuttanut selkkauksen varastaessasi teknologiaa - %s raivostui." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s on aiheuttanut selkkauksen varastaessaan teknologiaa sinulta." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Olet aiheuttanut selkkauksen lietsoessasi kapinaa kaupungissa %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s ovat aiheuttaneet selkkauksen lietsoessaan kapinaa kaupungissa %s." @@ -34653,19 +34642,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Vuoron aikaraja on nollaa pienempi ja muutetaan nollaksi." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Palvelin ei voinut asettaa aloitussijainteja." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Paljon maa-alaa – tässä voi mennä jonkin aikaa." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generaattori 3 ei asettanut kaikkia suuria saaria paikalleen." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generaattori 3 jätti %li maa-alasta sijoittamatta." @@ -34851,12 +34840,12 @@ "Työläiset kokoontuvat ja päättävät rakentaa talkoovoimin paremmat tukikohdan " "kaikkiin mahdollisiin kaupunkeihin." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Yksikkösi %s on siirretty muuttuneen maaston takia." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Yksikkösi %s on lakkautettu muuttuneen maaston takia." @@ -35537,8 +35526,8 @@ "tallennettu peli on vanha, tai tiedosto voi olla viallinen. Jatka omalla " "vastuullasi." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s on lisätty vaikeustason %s AI-pelaajaksi (%s)." @@ -38395,7 +38384,16 @@ msgstr "" "%s ilmoittaa, että tulitauko on päättynyt. Sinä ja %s olette nyt sodassa." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"%s ja %s ovat nyt sodassa tulitauon päätyttyä. Et voi olla liittolainen " +"ystäväsi vihollisen kanssa. Sinun ja %s liitto puretaan." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38404,53 +38402,53 @@ "%s ja %s ovat nyt sodassa tulitauon päätyttyä. Purat liittosi molempien " "kanssa." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Automaattisesti asetettu paikalleen avaruusaluksen osat, joita ei oltu vielä " "kiinnitetty." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Pakkaustyyppiä %d ei tueta" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Pelin tallennus tiedostoon %s epäonnistui" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Peli tallennettu tiedostoon %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Peli on jo käynnissä." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Aloitan pelin." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "tuntemattoman raporttityypin pyyntö (tyyppi %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Varoitus: hylättiin vanha asiakasohjelma %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38458,52 +38456,52 @@ "Asiakasohjelmasi on liian vanha. Ole hyvä ja päivitä ohjelmasi vähintään " "Freeciv-versioon 2.2." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Sinulla ei ole tarvittavia oikeuksia muokkaamiseen." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "Kansakunta (%s) ei ole käyttäjän valittavissa." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, 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:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s on %s hallitsija %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "pyydetty määrä ole enemmän kuin 'maxplayers' asetus sallii" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "käytössä olevassa kansavalikoimassa ei ole riittävästi kansakuntia (kokeile " "muuttaa 'nationset' asetusta)" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "Kansakuntia ei ole riittävästi." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s sai johtaakseen %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -38511,34 +38509,34 @@ "Tämä civ-palvelinohjelma tukee käyttäjien kirjautumista (autentikaatiota), " "mutta se ei ole tällä hetkellä käytössä." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Lähetän tietoa metapalvelimelle <%s>" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "En käynnisty ilman erikseen pyydettyä metapalvelinyhteyttä." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Peli päättyy..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "Epäonnistuin luomaan sopivaa karttaa, yritän uudelleen uudella siemenluvulla." -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "En onnistunut luomaan sopivaa karttaa annetuilla asetuksilla." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Asetus '%s' on muutettu arvosta %s arvoon %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Vastaanotan nyt uusia asiakasohjelmien yhteydenottoja porttiin %d." @@ -40391,19 +40389,19 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%s oppivat tekniikan %s kaupanpäällisiksi saatuaan tekniikan %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Olematon tutkimuspanostus saa meidät menettämään Tulevaisuuden teknologian " "%d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Olematon tutkimuspanostus saa meidät menettämään teknologian %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -40412,7 +40410,7 @@ "Valtiomuotomme %s vaatima teknologia menetettiin. Kansa on noussut ja " "vallankumous tähtää valtiomuotoon %s." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -40421,35 +40419,35 @@ "Tulevan valtiomuotomme %s vaatima teknologia menetettiin. Kansa tähtää nyt " "valtiomuotoon %s." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s ei voi rakentaa hanketta %s. Vaadittu teknologia on menetetty." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Teknologiatavoitteena on %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Varastat edistysaskeleen %s kohteelta %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "" "%2$s on vuotanut vieraalle vallalle - %1$s varastivat teknologian sinulta!" # TODO: Needs capitalization tag. -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" "Diplomaattien mukaan %1$s ovat varastaneet teknologian %2$s kansalta %3$s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -41379,6 +41377,18 @@ msgid "error %d (compiled without strerror)" msgstr "virhe %d (funktio strerror() ei ole käytössä)" +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ei voi vielä saada hanketta %s valmiiksi." + +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), käyttöliittymä %s" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), Qt-käyttöliittymä" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + #~ msgid "LAN" #~ msgstr "Paikallinen verkko" diff -Nru freeciv-2.5.7/translations/freeciv/freeciv.pot freeciv-2.5.8/translations/freeciv/freeciv.pot --- freeciv-2.5.7/translations/freeciv/freeciv.pot 2017-05-13 12:07:44.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/freeciv.pot 2017-08-12 11:54:30.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -286,12 +286,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "" -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "" @@ -323,7 +323,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -703,13 +703,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1769,10 +1769,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "" @@ -2482,7 +2482,7 @@ msgstr "" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "" @@ -3110,16 +3110,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "" @@ -3229,11 +3229,11 @@ msgstr "" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "" @@ -3389,9 +3389,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "" @@ -3510,7 +3510,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "" @@ -3534,7 +3534,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -3901,12 +3901,12 @@ msgid "Load Lua Script" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -3934,8 +3934,8 @@ msgid "Set local options" msgstr "" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "" @@ -4309,8 +4309,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "" @@ -4667,7 +4667,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "" @@ -4678,7 +4678,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4686,361 +4686,354 @@ "%s client" msgstr "" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" msgstr "" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "" -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "" @@ -5541,7 +5534,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "" @@ -5578,7 +5571,7 @@ msgstr "" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "" @@ -5814,8 +5807,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -5991,7 +5984,7 @@ msgstr[0] "" msgstr[1] "" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6007,7 +6000,7 @@ msgid "Yes" msgstr "" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6090,12 +6083,12 @@ msgid "This is Qt-client for Freeciv." msgstr "" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "" @@ -6124,7 +6117,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "" @@ -6271,9 +6264,9 @@ msgid "Game" msgstr "" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "" @@ -6298,8 +6291,8 @@ msgid "Leave game" msgstr "" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6558,7 +6551,7 @@ msgstr "" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "" @@ -6606,7 +6599,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "" @@ -6616,123 +6609,117 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "" -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "" @@ -6835,7 +6822,7 @@ msgid "Back" msgstr "" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "" @@ -7919,44 +7906,38 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "" @@ -14437,97 +14418,97 @@ msgid "?unitflag:Hunter" msgstr "" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "" -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" "Freeciv %s will be released in %s, at %s" msgstr "" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" "Freeciv %s will be released at %s" msgstr "" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "" @@ -15307,61 +15288,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "" @@ -17038,18 +17019,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "" @@ -17671,14 +17652,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -19344,9 +19325,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -19688,8 +19669,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "" @@ -20060,13 +20041,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -26641,19 +26627,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -26707,11 +26693,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -26743,13 +26729,13 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -26757,58 +26743,58 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "" @@ -27075,203 +27061,203 @@ msgid "A poorly-named city" msgstr "" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "" #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "" -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "" -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -27519,96 +27505,97 @@ msgid "The %s have started building a spaceship!" msgstr "" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "" #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "" -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "" -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "" -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "" -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -27616,7 +27603,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -27624,91 +27611,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "" #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "" #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -29351,32 +29338,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -29694,19 +29681,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -29866,12 +29853,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -30508,8 +30495,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -32808,136 +32795,143 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "" -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "" -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "" -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -34697,56 +34691,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/fr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/fr.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/fr.po freeciv-2.5.8/translations/freeciv/fr.po --- freeciv-2.5.7/translations/freeciv/fr.po 2017-05-13 12:07:51.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/fr.po 2017-08-12 11:54:37.000000000 +0000 @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Freeciv 2.4\n" +"Project-Id-Version: Freeciv 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2016-07-19 21:59+0200\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-11 15:05+0200\n" "Last-Translator: Igx \n" "Language-Team: French \n" "Language: fr\n" @@ -358,12 +358,12 @@ "de votre aide ! Honorez notre glorieuse alliance et votre nom restera à " "jamais !" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Les %s ont cessé la construction de %s à %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Les %s ont commencé la construction de %s à %s." @@ -399,7 +399,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -795,13 +795,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1916,10 +1916,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Drapeau" @@ -2644,7 +2644,7 @@ msgstr "Quelle nation voulez-vous être ?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Prendre une nation" @@ -3308,16 +3308,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nom" @@ -3427,11 +3427,11 @@ msgstr "Nations" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Type" @@ -3605,9 +3605,9 @@ msgid "Seen (Invis)" msgstr "Vue (Invisible)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Ville inconnue" @@ -3729,7 +3729,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Signaler les bogues à %s\n" @@ -3753,7 +3753,7 @@ msgstr "Maj+Entrée" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Vue" @@ -4125,12 +4125,12 @@ msgid "Load Lua Script" msgstr "Charger un script Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construire une nouvelle ville" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4160,8 +4160,8 @@ msgid "Set local options" msgstr "Définir les options locales" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Paramètres de la partie" @@ -4538,8 +4538,8 @@ msgid "Game/Scenario Properties" msgstr "Propriétés de la partie/du scenario" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Sauvegarder le scenario" @@ -4899,7 +4899,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, client %s." @@ -4910,7 +4910,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4921,268 +4921,261 @@ "commit : %s\n" "client %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), client %s." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Démarrer une _nouvelle partie" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Démarrer un _scenario" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "C_harger une partie" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Se c_onnecter à une partie en réseau" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Se connecter à Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Choisissez l'endroit où sauvegarder" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Parcourir..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 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:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nom du serveur" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Version" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Statut" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Joueurs" # AR -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Humains" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Commentaire" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Réseau loc_al" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Méta-Serveur Internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Hôte :" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port :" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login :" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Mot de _passe :" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irmer le mot de passe:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Hôte" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_onnexion" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nom de connexion : %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nom du joueur : %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Hôte : %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Info joueur/connect" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Permuter joueur prêt" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Choisir la nation" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observer ce joueur" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Prendre ce joueur" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Couper la connexion" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Permuter entre IA et jouer" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Retirer le Joueur" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Donner le niveau d'accès %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Ajouté dans %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Pas p_rêt" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "P_rêt" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Démarrage" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Prendre %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "_Choisir une nation" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Prendre ce _joueur" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Observer %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observer" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Ne pas _observer" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Aléatoire" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observateur" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Détaché" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5190,96 +5183,96 @@ "Nombre de _joueurs\n" "(y compris IA) :" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Niveau de l'I_A :" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Règles du jeu : " -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Plus d'options..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Enregistré" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Classement" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Prêt" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Chef" # AR -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Équipe" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Choisissez la partie à charger" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Choisissez _la partie à charger :" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Choisissez un scenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Choisissez un _scenario :" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nom du fichier :" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Sauvegarder la partie" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Parties sauve_gardées :" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Sauvegarder le _fichier :" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Sce_narii sauvegardés :" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Sauvegarder le sc_enario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Sauvegarder l'image de carte" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "_Images de carte sauvegardées :" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Sauvegarder les i_mages de carte :" @@ -5798,7 +5791,7 @@ "Des informations supplémentaires sont disponibles%sen cliquant à gauche sur " "les citoyens." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Nouveau mot de _passe : " @@ -5835,7 +5828,7 @@ msgstr "Changer la ville de rattachement" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Charger" @@ -6075,8 +6068,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6252,7 +6245,7 @@ msgstr[0] "Êtes-vous sûr de vouloir congédier cette unité ?" msgstr[1] "Êtes-vous sûr de vouloir congédier ces %1 unités ?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6268,7 +6261,7 @@ msgid "Yes" msgstr "Oui" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6355,12 +6348,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Client Qt pour Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Ne pas observer" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Observer" @@ -6394,7 +6387,7 @@ "de Qt après '--'. Se référer à la documentation de Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Quitter ?" @@ -6545,9 +6538,9 @@ msgid "Game" msgstr "Partie" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Options" @@ -6572,8 +6565,8 @@ msgid "Leave game" msgstr "Quitter la partie" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6833,7 +6826,7 @@ msgstr "Taux d'imposition..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Joueurs" @@ -6881,7 +6874,7 @@ msgid "... read more in help" msgstr "... plus d'informations dans l'aide" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Rafraîchir" @@ -6891,123 +6884,117 @@ msgstr "Appliquer" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, client Qt." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "commit : %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Client qt" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), client Qt." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Démarrer une nouvelle partie" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Démarrer un scenario" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Charger une partie sauvegardée" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Se connecter à une partie en réseau" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Se connecter" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Indentifiant" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Mot de passe" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Confirmer le mot de passe:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Serveurs Internet :" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Seveurs locaux :" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Date" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Parcourir..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Charger le scenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Chef" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Se déconnecter" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Démarrer" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Fichiers de sauvegarde" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Ouvrir la sauvegarde" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Fichiers de scenario" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Ouvrir le scenario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Observateurs globaux" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Pas prêt" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Choisir la difficulté" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Mettre en équipe" @@ -7110,7 +7097,7 @@ msgid "Back" msgstr "Retour" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Charger une partie" @@ -8245,44 +8232,38 @@ msgstr "Ajouter une nouvelle liste de travail" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "client %s." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Démarrer une nouvelle partie" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Rejoindre le jeu" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Rejoindre le serveur public" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Rejoindre un serveur local" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient vous souhaite la bienvenue..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Commit : %s" @@ -15437,83 +15418,83 @@ msgid "?unitflag:Hunter" msgstr "Chasseur" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv version %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(version bêta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv version %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv version %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "version de bêta test" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "version " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Janvier" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Février" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Mars" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Avril" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mai" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juin" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juillet" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Août" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Septembre" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Octobre" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Novembre" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Décembre" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15522,7 +15503,7 @@ "CECI EST UNE VERSION BÊTA\n" "Freeciv %s sortira en %s, sur %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15531,7 +15512,7 @@ "CECI EST UNE VERSION BÊTA\n" "Freeciv %s sortira sur %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Car la civilisation devrait être libre !" @@ -16467,61 +16448,61 @@ "Chaque collecteur de taxes produit deux ors supplémentaires pour votre " "trésorerie chaque tour." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Européen" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Classique" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropical" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Asiatique" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babylonien" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Celtique" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renaissance" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industriel" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Moderne" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Post moderne" @@ -18354,18 +18335,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "vert" @@ -19148,14 +19129,14 @@ "peut vous permettre de la finir en un tour seulement !" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Chef des barbares" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21175,9 +21156,9 @@ "Les explorateurs sont des braves solitaires qui se révèlent être bien " "pratiques pour découvrir des contrées inconnues." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21605,8 +21586,8 @@ "Chaque collecteur de taxes produit 3 ors supplémentaires pour votre " "trésorerie chaque tour." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Âge électrique" @@ -22075,13 +22056,18 @@ "C'est vous. Si vous perdez cette unité, vous perdez la partie. Faites y " "attention." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "Ne soulèvera de barbares dans les huttes" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -31561,19 +31547,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "inconnue" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Pas installé" @@ -31629,11 +31615,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Installateur de modpack de Freeciv (version en ligne de commande)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Modpack installé avec succès" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Échec de l'installation du Modpack : %s" @@ -31665,7 +31651,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Installer automatiquement les modpacks depuis l'URL donné" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31673,7 +31659,7 @@ "Installation de modpack en cours.\n" "Voulez-vous vraiment quitter?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Un autre téléchargement est déjà actif." @@ -31681,7 +31667,7 @@ msgid "Failed to start downloader" msgstr "Impossible de lancer le téléchargement." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31690,40 +31676,40 @@ "%s%s\n" "commit : %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Installé" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Type" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Sous-type" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Licence" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Installation du modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL du modpack" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Choisissez le modpack à installer" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31734,11 +31720,11 @@ "de Gtk après '--'. Se référer à la documentation de Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Installateur de modpack de Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Installateur de modpack de Freeciv (gtk3)" @@ -32033,92 +32019,92 @@ msgid "A poorly-named city" msgstr "Une ville mal nommée" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Pour %s, la ville de soutien devient %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "Les %s ont déjà un %s. Impossible de transférer le vôtre." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Transféré %s dans %s de %s à %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Transféré %s de %s à %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%2$s %1$s perdu durant le transfert vers la ville %3$s %4$s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Perte de %s avec le contrôle de %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "%s a été construit en remplacement dans %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Vous avez déjà une ville appelée %s. La ville est renommée %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Les habitants de %s sont impressionnés par votre niveau de technologie !" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Les travailleurs se rassemblent spontanément et améliorent %s avec %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" "Les travailleurs se rassemblent spontanément et améliorent les routes de %s." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" "Les travailleurs se rassemblent spontanément et améliorent les bases de %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Vous avez fondé %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "L'unité %s a été déplacée hors de votre ville %s démantelée puisqu'elle ne " "pouvait rester sur place (%s)." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Quand %s a été démantelée votre %s ne pouvait pas sortir et a donc été perdu." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -32126,121 +32112,121 @@ "Quand votre %s a été congédiée, votre %s dans %s a été piégée et a donc été " "perdu." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Vous détruisez intégralement %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s a été détruite par %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Vous conquérez %s, et pillez %d lingot !" msgstr[1] "Vous conquérez %s, et pillez %d lingots !" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s a conquis %s et y a pillé %d lingot." msgstr[1] "%s a conquis %s et y a pillé %d lingots." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Vous prenez %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s a conquis %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Vous avez libéré %s ! En cherchant bien vous trouvez %d lingot." msgstr[1] "Vous avez libéré %s ! Les pillages se montent à %d lingots." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s a libéré %s et y a pillé %d lingot." msgstr[1] "%s a libéré %s et y a pillé %d lingots." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Vous avez libéré %s !" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s a libéré %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "Commerce entre %s et %s perdu en même temps que les villes." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Route commerciale entre %s et %s annulée." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" "Commerce entre les villes %s de %s et %s perdu en même temps que les villes." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Désolé, les %s ont annulé la route commerciale de %s à votre ville %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "Nous avons annulé la route commerciale allant de %s à la ville %s de %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " d'après la liste de travail" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s construit %s%s." # AR : landlocked ? -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vous vendez %s à %s (maintenant enclavée) pour %d lingot." msgstr[1] "Vous vendez %s à %s (maintenant enclavée) pour %d lingots." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "La taille de la carte de la ville %s est %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "augmentée" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "diminuée" @@ -32527,77 +32513,80 @@ msgid "The %s have started building a spaceship!" msgstr "Les %s ont commencé la construction d'un vaisseau spatial !" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s ne peut pas encore construire %s." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" +"%s ne peut pas construire %s maintenant. (taille de la ville : %d, coût en " +"population de l'unité : %d)" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s a achevé la construction de %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s a coûté %d population. %s décroit à la taille %d." msgstr[1] "%s a coûté %d populations. %s décroit à la taille %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Impossible d'entretenir %s dans %s : bâtiment vendu!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Par assez d'or. %s congédié." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Pollution près de %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Célébrations en votre honneur à %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Les célébrations se sont achevé dans %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s a été frappée par une épidémie ! Des citoyens ont été perdus !" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Émeutes à %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "LES ÉMEUTES CONTINUENT à %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "L'ordre est rétabli à %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Le peuple a renversé votre %s, le trouble règne sur votre pays." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32605,13 +32594,13 @@ "seule ville." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s est congédié dans %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32620,7 +32609,7 @@ "nourriture disponible !" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32630,7 +32619,7 @@ "nourriture disponible !" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32640,7 +32629,7 @@ "nourriture disponible !" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32649,7 +32638,7 @@ "nécessaire pour que la ville puisse se développer !" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32658,7 +32647,7 @@ "nécessaire pour que la ville puisse se développer !" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32666,75 +32655,75 @@ "Les émigrants de %s (%s) ne peuvent aller à %s car une construction y est " "nécessaire pour que la ville puisse se développer !" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s a été démantelée par ses habitants." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Des émigrants de %s sont partis en quête d'une vie meilleure à %s." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" "Des émigrants de %s sont partis en quête d'une vie meilleure à %s (%s)." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" "Des émigrants de %s (%s) sont partis en quête d'une vie meilleure à %s." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%s a été atteinte par un(e) %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Retombées nucléaires près de %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s a provoqué une perte de population à %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s détruit %s à %s." # AR : problème de a/an #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Toute la nourriture stockée a été perdue à %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "La production de %s à %s a été détruite." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" "Des citoyens de %s envisagent d'émigrer vers %s en quête d'une vie meilleure." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34732,38 +34721,38 @@ msgid "Your %s was captured after completing the mission." msgstr "Votre %s a été capturé après avoir rempli sa mission." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" "Vous avez causé un incident diplomatique en tentant de soudoyer %2$s %1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s a provoqué un incident diplomatique en soudoyant votre %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "Vous avez provoqué un incident diplomatique en essayant de voler une " "technologie à %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s a provoqué un incident diplomatique en essayant de vous voler une " "technologie." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "Vous avez provoqué un incident diplomatique en fomentant une révolte dans %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -35147,19 +35136,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Le timeout est inférieur à zéro, mis à zéro." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Le serveur n'a pas pu allouer des positions de départ." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Beaucoup de terres - cela risque de prendre quelques secondes." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 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:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Le générateur 3 a laissé %li terres non placées." @@ -35349,12 +35338,12 @@ "Les travailleurs se rassemblent spontanément et améliorent les bases dans " "tous les villes possibles." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Déplacement de %s suite à la transformation du terrain." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Démantèlement de votre %s suite à la transformation du terrain." @@ -36050,8 +36039,8 @@ "peut arriver avec de vieilles parties sauvegardées, ou bien peut indiquer un " "fichier de sauvegarde invalide. Continuez à vos risques et périls." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -38982,7 +38971,16 @@ "Le cessez-le-feu avec %s a pris fin. Vos relations avec les %s sont " "désormais à la guerre." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Le cessez-le-feu entre %s et %s est terminé. Ils sont en guerre. Vous " +"annulez votre alliance avec %s." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38991,54 +38989,54 @@ "Le cessez-le-feu entre %s et %s est terminé. Ils sont en guerre. Votre " "alliance avec ces deux joueurs est annulée." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Mise en place automatique des éléments du vaisseau spatial qui n'ont " "toujours pas été intégrées." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Type de compression non supporté %d." # AR -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Échec dans la sauvegarde de la partie sous %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Partie sauvegardée sous %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "La partie est déjà en cours." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Démarrage du jeu." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "requête d'un rapport inconnu (type %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Attention : rejet d'un ancien client %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -39046,51 +39044,51 @@ "Votre client est trop vieux. Pour utiliser ce serveur veuillez mettre votre " "client à jour avec une version Freeciv 2.2 ou ultérieure." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Vous n'êtes pas autorisé à éditer." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "La nation %s n'est pas disponible comme choix utilisateur." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "La nation %s est déjà prise." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s est le chef %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "demande plus que la valeur de l'option 'maxplayers'" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "pas assez de nations jouables dans cet ensemble de nations (voir l'option " "'nationset')" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "pas assez de nations jouables." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s dirige les %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -39098,36 +39096,36 @@ "Ce serveur Freeciv a un support d'authentification des joueurs, mais il est " "actuellement désactivé." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Envoi d'informations au méta-serveur <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" "Impossible de démarrer sans connexion au méta-serveur explicitement demandée." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "La partie est terminée..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "Impossible de créer une carte convenable, nouvel essai avec une autre clé de " "génération" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Impossible de créer une carte convenable avec les paramètres donnés." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "L'option '%s' a été modifiée de %s à %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Accepte dorénavant les connexions de nouveaux clients sur le port %d" @@ -41012,18 +41010,18 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%s a acquis %s suite à l'apprentissage de %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Production de science insuffisance. Nous avons perdu la Techno Future %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Production scientifique insuffisante. Nous avons perdu %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -41032,7 +41030,7 @@ "La technologie nécessaire pour notre gouvernement '%s' a été perdue. Les " "citoyens ont commencé une révolution vers '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -41041,32 +41039,32 @@ "La technologie nécessaire pour notre nouveau gouvernement '%s' a été perdue. " "Les citoyens ont choisi '%s' comme leur nouvel objectif de gouvernement." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s ne peut construire %s. La technologie nécessaire a été perdue." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Le but technologique est %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Vous avez volé %s aux %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Les %s vous ont volé %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Les %s ont volé %s aux %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -41999,6 +41997,18 @@ msgid "error %d (compiled without strerror)" msgstr "erreur %d (compilation sans strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), client %s." + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), client Qt." + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ne peut pas encore construire %s." + #~ msgid "LAN" #~ msgstr "LAN" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ga.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ga.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ga.po freeciv-2.5.8/translations/freeciv/ga.po --- freeciv-2.5.7/translations/freeciv/ga.po 2017-05-13 12:07:52.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ga.po 2017-08-12 11:54:37.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: freeciv 2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-01-29 07:42-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -422,13 +422,13 @@ "Tabhair aitheantas dár n-aontas glórmhar agus ní dhearmadfar d'ainm go deo!" # nation plural, city_production_name, city -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Stop na %s ar thógáil %s in %s" # nation plural, city_improvement_name, city -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Thosaigh na %s ar thógáil %s in %s." @@ -465,7 +465,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -869,13 +869,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1967,10 +1967,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bratach" @@ -2728,7 +2728,7 @@ msgstr "" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Roghnaigh Náisiún" @@ -3413,16 +3413,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Ainm" @@ -3533,11 +3533,11 @@ msgstr "Náisiúin" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Cineál" @@ -3696,9 +3696,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Anaithnid" @@ -3818,7 +3818,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "" @@ -3842,7 +3842,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "?noun:Amharc" @@ -4215,12 +4215,12 @@ msgid "Load Lua Script" msgstr "Luchtaigh Script Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Tóg Cathair Nua" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4248,8 +4248,8 @@ msgid "Set local options" msgstr "Socraigh roghanna logánta" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Socruithe an Chluiche" @@ -4626,8 +4626,8 @@ msgid "Game/Scenario Properties" msgstr "Airíonna an Chluiche/Chnámhscéil" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Sábháil an Cnámhscéal" @@ -4986,7 +4986,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, cliant %s" @@ -4997,7 +4997,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5005,369 +5005,362 @@ "%s client" msgstr "%s%s, cliant %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s, cliant %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Tosaigh Cluiche _Nua" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "To_saigh Cluiche Cnámhscéil" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Luchtaigh Cluiche Sábháilte" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Ceangail le Cluiche Lí_onra" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Ceangail le _Lárionad Cluichíochta" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Brabhsáil..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Ainm an Fhreastalaí" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Leagan" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Stádas" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Imreoirí" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Daoine" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Nóta" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Líonr_a Logánta" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Meitifhreastalaí _Idirlín" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Óstríom_haire:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Logáil Isteach:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Focal Faire:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "D_earbhaigh an Focal Faire:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Óstríomhaire" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_eangail" # username -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Ainm an cheangail: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Ainm an imreora: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Óstríomhaire: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Eolas faoin imreoir/cheangal" # username or playername -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Eolas faoi %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Roghnaigh náisiún" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Roghnaigh an t-imreoir seo" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Bris an ceangal" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Bain an t-imreoir" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Tabhair rochtain do %s" # FIXME; lenition #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Cuir ar %s é" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Réidh" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Tosaigh" # %s = player -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Roghnaigh %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Roghnaigh _Náisiún" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Roghnaigh Imreoir" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Breathnaigh %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Breathnaigh" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Ná _breathnaigh" # Away, Novice, Easy, Normal, Hard, Cheating... #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Randamach" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Breathnóir" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Dícheangailte" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Líon na nImreoirí (IS san áireamh):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_Leibhéal an IS:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Rialacha" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Tuilleadh Roghanna..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Taifead" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rátáil" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Réidh" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:Ceannaire" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Foireann" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Roghnaigh Cnámhscéal" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Roghnaigh Cnámh_scéal:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Ainm comhaid:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Sábháil an Cluiche" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Cluichí Sábháilte:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "C_námhscéalta Sábháilte:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Sábháil an _Cnámhscéal:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Sábháil Íomhá Mhapa" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Sábháil Í_omhánna Mapa:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Sábháil Íomhánna _Mapa:" @@ -5881,7 +5874,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Focal Faire:" @@ -5922,7 +5915,7 @@ msgstr "gan cathair bhaile" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Luchtaigh" @@ -6209,8 +6202,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6402,7 +6395,7 @@ msgstr[3] "An bhfuil tú cinnte gur mian leat scor?" msgstr[4] "An bhfuil tú cinnte gur mian leat scor?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6418,7 +6411,7 @@ msgid "Yes" msgstr "Tá" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6509,13 +6502,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Seo é Qt-client le haghaidh Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Ná _breathnaigh" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Breathnaigh" @@ -6549,7 +6542,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Scoir" @@ -6731,9 +6724,9 @@ msgid "Game" msgstr "Cluiche" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Roghanna" @@ -6762,8 +6755,8 @@ msgid "Leave game" msgstr "Tréig an Cluiche" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7037,7 +7030,7 @@ msgstr "Rátaí Cánach..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7089,7 +7082,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Athnuaigh" @@ -7100,141 +7093,135 @@ msgstr "Cuir i bhfeidhm uair amháin" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "%s%s, cliant %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Aonad: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s, cliant %s" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Tosaigh Cluiche Nua" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "To_saigh Cluiche Cnámhscéil" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Luchtaigh cluiche sábháilte ó COMHAD" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Ceangail le Cluiche Lí_onra" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Ceangail" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Logáil Isteach:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Focal Faire" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "D_earbhaigh an Focal Faire:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Meitifhreastalaí _Idirlín" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "%s le breathnóirí domhanda: %s" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Brabhsáil..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Sábháil an Cnámhscéal" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Ceannaire:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Dícheangail" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Tosaigh" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Sábháil Imreoirí" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Ainm an Chnámhscéil" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Ainm an Chnámhscéil" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "%s le breathnóirí domhanda: %s" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr ", réidh" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", leibhéal deacrachta %s" # FIXME; lenition -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Cuir ar %s é" @@ -7344,7 +7331,7 @@ msgid "Back" msgstr "Siar" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Luchtaigh Cluiche" @@ -8487,44 +8474,38 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv leagan %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "%s%s, cliant %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Tosaigh Cluiche Nua" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Téigh i gCluiche" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Cathair: %s" @@ -15433,83 +15414,83 @@ msgid "?unitflag:Hunter" msgstr "?unitclass:Héileacaptair" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv leagan %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(leagan béite)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv leagan %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv leagan %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "leagan béite " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "leagan " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Eanáir" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Feabhra" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Márta" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Aibreán" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Bealtaine" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Meitheamh" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Iúil" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Lúnasa" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Meán Fómhair" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Deireadh Fómhair" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Samhain" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Nollaig" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15518,7 +15499,7 @@ "LEAGAN BÉITE É SEO\n" "Cuirfear Freeciv %s ar fáil i %s, ag %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15527,7 +15508,7 @@ "LEAGAN BÉITE É SEO\n" "Cuirfear Freeciv %s ar fáil ag %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Toisc gur ceart go bhfuil sibhialtacht saor!" @@ -16307,61 +16288,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Eorpach" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Clasaiceach" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Teochreasach" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Áiseach" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Bablónach" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Ceilteach" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Athbheochan" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Tionsclaíoch" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Nua-Aimseartha" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Iar-Nua-Aoiseach" @@ -18048,18 +18029,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "núíosach" @@ -18693,14 +18674,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Ceannaire Barbarach" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20384,9 +20365,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20737,8 +20718,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "" @@ -21118,13 +21099,18 @@ "Tusa. Má chailleann tú an t-aonad seo, caillfidh tú an cluiche. Mar sin, ná " "caill." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -27733,19 +27719,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "?license:Anaithnid" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -27799,11 +27785,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -27835,14 +27821,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "An bhfuil tú cinnte gur mian leat scor?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -27850,58 +27836,58 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Ceadúnas" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "" @@ -28199,25 +28185,25 @@ msgstr "Cathair a bhfuil drochainm uirthi" # %s = unit, city -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Athraíodh cathair dhúchais an aonaid (%s) go %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" # %s = unit, city, nation_plural, nation_plural -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s i %s aistrithe ó na %s go dtí na %s." # %s = unit, nation_plural, nation_plural -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s aistrithe ó na %s go dtí na %s." @@ -28225,32 +28211,32 @@ # %s = nation_adj, unit, nation_adj, city; first is ok since all units are # masculine and singular... #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%2$s %1$s caillte le linn aistrithe go %4$s (%3$s)" # %s = unit, city -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Cailleadh %s, chomh maith le smacht ar %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Tógáladh %s nua i %s." # %s = city, city -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "Bhí cathair darb ainm %s agat cheana. Cuireadh ainm nua %s ar an gcathair." # %s = city -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -28259,7 +28245,7 @@ "le hiarnród." # %s = city -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" @@ -28268,7 +28254,7 @@ "le hiarnród." # %s = city -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" @@ -28277,7 +28263,7 @@ "le hiarnród." # %s = city -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" @@ -28286,19 +28272,19 @@ "le hiarnród." # %s = city -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Bhunaigh tú %s." # %s = unit, city, terrain_name; FIXME -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Bogadh %s ó chathair scortha %s toisc nach bhfuil aige fanacht ar %s." # city, unit; FIXME (prefix t if unit starts with vowel) -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -28306,7 +28292,7 @@ "Nuair a scoireadh %s, cailleadh an %s s'agat toisc nach raibh sé in ann éalú." # city, unit; FIXME (prefix t if unit starts with vowel) -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -28314,19 +28300,19 @@ "Nuair a scoireadh %s, cailleadh an %s s'agat toisc nach raibh sé in ann éalú." # city -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Díothaíonn tú %s." # city, player -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Bhí %s díothaithe ag %s." # city -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -28337,7 +28323,7 @@ msgstr[4] "Ghabh tú %s; tá luach %d píosa óir ar do chuid creiche!" # player, city -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -28348,19 +28334,19 @@ msgstr[4] "Fuair %s bua ar %s agus ghoid sé %d píosa óir ón chathair." # city -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Faigheann tú bua ar %s." # player, city -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "Fuair %s bua ar %s." # city -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -28371,7 +28357,7 @@ msgstr[4] "D'fhuascail tú %s! Tá luach %d píosa óir ar do chuid creiche." # player, city -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -28382,60 +28368,60 @@ msgstr[4] "D'fhuascail %s %s agus ghoid sé %d píosa óir ón chathair." # city -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Bhí %s fuascailte agat!" # player, city -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "D'fhuascail %s %s." # city, city -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Cealaíodh trádbhealach idir %s agus %s." # city, city -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Cealaíodh trádbhealach idir %s agus %s." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" # nation_plural, city, city -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Chealaigh na %s an trádbhealach ó %s go cathair de do chuid %s." # nation_plural, city, city #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Chealaigh na %s an trádbhealach ó %s go cathair de do chuid %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " ón liosta oibre" # source = " from the worklist" always? #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "Tá %s ag tógáil %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -28446,16 +28432,16 @@ msgstr[4] "Dhíol tú %s in %s (atá talamhiata anois) ar %d píosa óir." # %s = city, then "increased" or "decreased" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Bhí méid an mhapa de %s %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "méadaithe" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "laghdaithe" @@ -28790,22 +28776,22 @@ msgid "The %s have started building a spaceship!" msgstr "Thosaigh na %s ar spáslong a thógáil!" -# city, unittype -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "Níl %s in ann %s a thógáil fós." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" # city, unittype #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "Chríochnaigh na %s ar a %s a thógáil." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -28816,68 +28802,68 @@ msgstr[4] "" # improvement, city -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Ní féidir %s a chothú i %s; díoladh an foirgneamh!" # unit -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Níl go leor óir ann. Díscaoileadh %s." # city -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Truailliú i ngar do %s." # city -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Ceiliúradh in ómós duit i %s." # city -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Cuireadh ceiliúradh ar ceal i %s." # city -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "Tá %s faoi aicíd! Cailleadh daoine!" # city -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Corraíl shibhialta in %s." # city -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "Tá an chorraíl shibhialta ar siúl in %s go fóill." # city -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Tá síochán in %s arís." # government name # %s = Monarchy, Republic, Communism, Anarchy, Depotism -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Threascair na daoine do rialtas (%s), tá do thír trí chéile." # city, unittype -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -28886,14 +28872,14 @@ # city, unittype #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "Is %2$s iad na daoine i %1$s ina dhiaidh dóibh scarúint." # city ... city #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -28903,7 +28889,7 @@ # city ... city (nation adj.) #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -28914,7 +28900,7 @@ # city (nation adj.) ... city #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -28924,14 +28910,14 @@ "ar fáil!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "Níl ag imircigh ó %s dul chuig %s toisc gá feabhais ann!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -28940,7 +28926,7 @@ "go dtiocfaidh fás air." #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -28949,71 +28935,71 @@ "le go dtiocfaidh fás air!" # city -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "Bhí %s tréigthe ag a saoránaigh." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Chuaigh imircigh ó %s go %s ar thóir saoil níos fearr." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Chuaigh imircigh ó %s go %s (%s) ar thóir saoil níos fearr." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Chuaigh imircigh ó %s (%s) go %s ar thóir saoil níos fearr." # %s = unit, then either nation_plural or "yourself"; FIXME (na tusa?!) #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "Dhíothaigh na %2$s %1$s le buama núicléach." # city -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Truailliú i ngar do %s." # city #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "D'ísligh gorta an daonra in %s." # nation_plural, improvement, city #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "Scrios na %s an %s in %s." # unit, improvement, city #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Scrios do %s an %s in %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Uasghrádadh táirgiú %s go %s in %s." # city, city -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -29021,7 +29007,7 @@ "fearr." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30817,20 +30803,20 @@ msgstr "Gabhadh do %s ina dhiaidh dheireadh a mhisin." # nation_adj, unit -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" "Ba tusa cúis le heachtra scannalach agus an %2$s %1$s á bhreabadh agat." # player, unit -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "Ba %s cúis le heachtra scannalach agus do %s á bhreabadh." # player -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" @@ -30838,20 +30824,20 @@ "teicneolaíocht a ghoid ó %s." # player -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "Ba %s cúis le heachtra scannalach agus é ag déanamh iarrachta teicneolaíocht " "a ghoid uait." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "Ba tusa cúis le heachtra scannalach agus éirí amach á ghríosú agat in %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -31173,19 +31159,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -31361,13 +31347,13 @@ "le hiarnród." # %s = unit -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" # %s = unit -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -32070,8 +32056,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -34423,142 +34409,149 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" + # player, player -#: server/srv_main.c:778 +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Ní thacaítear leis an gcineál comhbhrúite %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Theip ar an cluiche a shábháil mar %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Sábháladh an cluiche mar %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Tá an cluiche ag rith cheana." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Cluiche á thosú." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "iarratas ar thuairisc anaithnid (cineál %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Rabhadh: seanchliant %s á dhiúltú" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Níl cead agat aon rud a chur in eagar." # nation_adj -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Níl an náisiún %s ar fáil sa chnámhscéal seo." # nation_adj -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Tá an náisiún %s in úsáid cheana." # username, nation_adj, playername -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "Is é %s an rialtóir %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Fanacht le tús an chluiche: tá %d as %d imreoir réidh." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" # %s = player, nation_plural -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "Tá %s i gceannas ar na %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Faisnéis á seoladh go dtí meitifhreastalaí <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Tá an cluiche críochnaithe..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" # city, player -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Bhí %s díothaithe ag %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Glacadh le ceangail nua ó chliaint anois." @@ -36386,19 +36379,19 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" # advance -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" # government, government -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -36406,7 +36399,7 @@ msgstr "" # government, government -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -36414,37 +36407,37 @@ msgstr "" # city, improvement -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" # advance -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" # advance, nation_plural -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Goideann tú %s ó na %s." # nation_plural, advance -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Ghoid na %s %s uait!" # nation_plural, advance, nation_plural -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Ghoid na %s %s ó na %s." # advance -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -37471,6 +37464,22 @@ msgid "error %d (compiled without strerror)" msgstr "earráid %d (tiomsaithe gan strerror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s, cliant %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s, cliant %s" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv leagan %s (%s)" + +# city, unittype +#~ msgid "%s can't build %s yet." +#~ msgstr "Níl %s in ann %s a thógáil fós." + #~ msgid "Ruleset _Version:" #~ msgstr "_Leagan na Rialacha:" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/gd.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/gd.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/gd.po freeciv-2.5.8/translations/freeciv/gd.po --- freeciv-2.5.7/translations/freeciv/gd.po 2017-05-13 12:07:52.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/gd.po 2017-08-12 11:54:37.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2014-08-08 08:40+0100\n" "Last-Translator: Michael Bauer \n" "Language-Team: Akerbeltz\n" @@ -399,12 +399,12 @@ "cuideachadh! Cumaibh ri ar caidreachas glòrmhor agus mairidh ur n-ainm beò " "gu sìorraidh bràth!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Sguir %s dhen a bhith a' togail: %s ann an: %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Thòisich %s air: %s a thogail ann an: %s." @@ -442,7 +442,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -849,13 +849,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1986,10 +1986,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bratach" @@ -2733,7 +2733,7 @@ msgstr "Dè an nàisean a bhios annad fhèin?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Tagh nàisean" @@ -3423,16 +3423,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Ainm" @@ -3543,11 +3543,11 @@ msgstr "Nàiseanan" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Seòrsa" @@ -3722,9 +3722,9 @@ msgid "Seen (Invis)" msgstr "Air fhaicinn (Do-fhaicsinneach)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Neo-aithnichte" @@ -3847,7 +3847,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Dèan aithris air bugaichean aig %s\n" @@ -3871,7 +3871,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "?noun:Sealladh" @@ -4245,12 +4245,12 @@ msgid "Load Lua Script" msgstr "Luchdaich sgriobt Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "A' togail baile ùr" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4280,8 +4280,8 @@ msgid "Set local options" msgstr "Suidhich na roghainnean ionadail" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Roghainnean a' gheama" @@ -4657,8 +4657,8 @@ msgid "Game/Scenario Properties" msgstr "Roghainnean a' gheama/a' chnàmh-sgeòil" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Sàbhail an cnàmh-sgeul" @@ -5019,7 +5019,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "Seo %s%s, cliant %s" @@ -5030,7 +5030,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5038,366 +5038,359 @@ "%s client" msgstr "Seo %s%s, cliant %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Seo %s%s, cliant %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Tòisich _air geama ùr" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Tòisich air geama cnàmh-_sgeòil" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Luchdaich geama a chaidh a shàbhaladh" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Dè_an ceangal ri geama lìonraidh" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Dèan ceangal ri sòn geamaireachd" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Tagh àite far an dèid a shàbhaladh" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Brabhsaich..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" "Chan eil na faclan-faire a' freagairt ri chèile, cuir a-steach am facal-" "faire a-rithist." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Ainm an fhrithealaiche" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Tionndadh" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Staid" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Cluicheadairean" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Daoine" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Beachd" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Local _Area Network" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Meata-fhrithealaiche eadar-lìn" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Ò_stair:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Logadh a-steach:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Facal-faire:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Dearbha_ich am facal-faire:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Òstair" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Ceangail" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Ainm a' cheangail: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Ainm a' chluicheadair: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Òstair: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Cluicheadair/fiosrachadh ceangail" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Fiosrachadh %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Toglaich na cluicheadairean a tha deiseil" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Tagh nàisean" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Coimhead air a' chluicheadair" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Gabh an cluicheadair seo os làimh" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Bris an ceangal" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "IF-toglaich an cluicheadair" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Thoir air falbh an cluicheadair" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Thoir inntrigidh dha %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Cuir air %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Trang _fhathast" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Deiseil" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Tòisich" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Gabh %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Tagh _nàisean" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Gabh cluicheadair" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "C_oimhead air %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "C_oimhead" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Na _coimhead" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Air thuaiream" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Coimheadaiche" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Dealaichte" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Àireamh de _chluicheadairean (a' gabhail a-steach na h-IF):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_Leibheil sgilean na h-Intinne Fhuadain:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Seata nan riaghailtean" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Barrachd roghainnean airson a' gheama..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Reacord" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rangachadh" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Deiseil" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:Ceannard" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Sgioba" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Tagh geama sàbhalaichte a tha ri luchdadh" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Tagh geama sàbhalaichte a tha ri _luchdadh:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Tagh cnàmh-sgeul" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Tagh cnàmh-_sgeul:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Ainm an fhaidhle:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Sàbhail an geama" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Geamannan sàbhalaichte:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Sàbhail ainm an _fhaidhle:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Sàbhail _cnàmh-sgeulan:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "_Sàbhail an cnàmh-sgeul:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Sàbhail dealbh dhen mhapa" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Sàbhail d_ealbhan dhen mhapa:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Sàbhail de_albhan dhen mhapa:" @@ -5934,7 +5927,7 @@ "Tha barrachd fiosrachaidh ri fhaighinn ma nì thu briogadh clì air na " "saoranaich." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Facal-faire:" @@ -5975,7 +5968,7 @@ msgstr "Tagh seo mar bhaile dachaigh ùr" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Luchdaich" @@ -6271,8 +6264,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6464,7 +6457,7 @@ msgstr[2] "A bheil thu cinnteach gu bheil thu airson fàgail?" msgstr[3] "A bheil thu cinnteach gu bheil thu airson fàgail?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6480,7 +6473,7 @@ msgid "Yes" msgstr "Tha" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6570,13 +6563,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Seo an cliant Qt airson Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Na _coimhead" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "C_oimhead" @@ -6615,7 +6608,7 @@ "an dèidh '--'. Faic an treòrachadh Gtk.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Fàg an-seo" @@ -6795,9 +6788,9 @@ msgid "Game" msgstr "Geama" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Roghainnean" @@ -6826,8 +6819,8 @@ msgid "Leave game" msgstr "Fàg an geama" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7105,7 +7098,7 @@ msgstr "Reataichean nan cìsean..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7157,7 +7150,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Nuadhaich" @@ -7168,142 +7161,136 @@ msgstr "Cuir an sàs aon turas" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Seo %s%s, cliant %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Aonad: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Seo %s%s, cliant %s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Seo %s%s, cliant %s" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Tòisich air geama ùr" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Tòisich air geama cnàmh-_sgeòil" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Luchdaich FILE geama a chaidh a shàbhaladh" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Dè_an ceangal ri geama lìonraidh" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Ceangail" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_Logadh a-steach:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Facal-faire" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Dearbha_ich am facal-faire:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_Meata-fhrithealaiche eadar-lìn" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "coimheadaiche uile-choitcheann" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Brabhsaich..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Sàbhail an cnàmh-sgeul" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Ceannar_d:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Dì-cheangail" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Tòisich" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Sàbhail na cluicheadairean" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Sàbhail ainm an _fhaidhle:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Ainm a' chnàmh-sgeòil" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Ainm a' chnàmh-sgeòil" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "coimheadaiche uile-choitcheann" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Trang _fhathast" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", leibheil an duilgheadais %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Cuir air %s" @@ -7414,7 +7401,7 @@ msgid "Back" msgstr "Air ais" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Luchdaich an geama" @@ -8573,44 +8560,38 @@ msgstr "Cuir liosta obrach ùr ris" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Tionndadh Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Seo %s%s, cliant %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Tòisich air geama ùr" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Gabh pàirt ann an geama" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Gabh pàirt air pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Gabh pàirt air frithealaiche LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Tha an SDLClient a' cur fàilte ort..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Baile: %s" @@ -16070,83 +16051,83 @@ msgid "?unitflag:Hunter" msgstr "?unitclass:Heileacoptair" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Tionndadh %s %s de Freeciv" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(tionndadh beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Tionndadh Freeciv %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Tionndadh Freeciv %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "tionndadh betatest" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "tionndadh " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "san Fhaoilleach" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "sa Ghearran" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "sa Mhàrt" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "sa Ghiblean" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "sa Chèitean" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "san Ògmhios" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "san Iuchar" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "sa Lùnastal" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "san t-Sultain" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "san Dàmhair" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "san t-Samhain" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "san Dùbhlachd" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16155,7 +16136,7 @@ "'S E TIONNDADH BETA A THA SEO\n" "Thèid Freeciv %s a sgaoileadh %s, %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16164,7 +16145,7 @@ "'S E TIONNDADH BETA A THA SEO\n" "Thèid Freeciv %s a sgaoileadh %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Oir bu chòir do shìobhaltas a bhith saor!" @@ -17084,61 +17065,61 @@ "Cruthaichidh gach cìsear dà phìos òir a bharrachd airson d' ionmhais gach " "cuairt." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Eòrpach" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Clasaigeach" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropaigeach" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Àiseanach" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babalonach" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Ceilteach" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Nòs an Renaissance" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Gnìomhachail" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Ùr-nòsach" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Post-modarnach" @@ -18949,18 +18930,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "glas" @@ -19753,14 +19734,14 @@ "a thogail gus crìoch a chur air ann an cuairt!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Ceannard borbach" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21787,9 +21768,9 @@ "'S e daoine curanta a tha anns na taisgealaichean a tha glè fheumail gus " "àrainn neo-aithnichte a rùrachadh." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -22221,8 +22202,8 @@ "Cruthaichidh gach cìsear trì pìosan òir a bharrachd airson d' ionmhais gach " "cuairt." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "?citystyle:Linn an Dealain" @@ -22685,13 +22666,19 @@ "Seo thusa. Ma chailleas tu an t-aonad seo, caillidh thu an geama. Feuch 's " "na dèan sin ma-tà!" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Chan fhaod ach borbaich seo a thogail.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -31773,19 +31760,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "?license:Neo-aithnichte" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -31840,12 +31827,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Stàlaichear Freeciv modpack" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s air a ghiùlan gu soirbheachail." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -31879,14 +31866,14 @@ msgid "Automatically install modpack from a given URL" msgstr "Luchdaich an liosta modpack on URL a chuir thu ann" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "A bheil thu cinnteach gu bheil thu airson fàgail?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Tha luchdadh a-nuas eile a' dol mu thràth" @@ -31894,48 +31881,48 @@ msgid "Failed to start downloader" msgstr "Dh'fhàillig tòiseachadh an luchdaicheir" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 #, fuzzy msgid "Installed" msgstr "Stàlaich am modpack" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "?modpack:Type" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Ceadachas" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Stàlaich am modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Modpack URL" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Tagh am modpack a thèid a stàladh" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 #, fuzzy msgid "" "This modpack installer accepts the standard Gtk command-line options\n" @@ -31947,12 +31934,12 @@ "an dèidh '--'. Faic an treòrachadh Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Stàlaichear Freeciv modpack" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Stàlaichear Freeciv modpack" @@ -32265,89 +32252,89 @@ msgid "A poorly-named city" msgstr "Baile le droch ainm" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Chaidh prìomh bhaile %s atharrachadh gu %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Chaidh %s a ghluasad ann an %s o %s gu %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Chaidh %s a ghluasad o %s gu %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "Chaidh %2$s %1$s air chall ann an gluasad gu %4$s %3$s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s air chall on a chaill thu smachd air %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Chaidh %s ùr a thogail 'na àite ann an %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "Tha baile air a bheil %s agad mu thràth. Chaidh %s a chur air a' bhaile." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "Tha muinntir %s fo iongnadh d' eòlais theicneolaich!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" "Tha obraichean a' tighinn còmhla air an ceann fhìn agus a' leasachadh nan " "rathaidean sa bhaile gu rathaidean-iarainn ann an %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" "Tha obraichean a' tighinn còmhla air an ceann fhìn agus a' leasachadh nan " "rathaidean sa bhaile gu rathaidean-iarainn ann an %s." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" "Tha obraichean a' tighinn còmhla air an ceann fhìn agus a' leasachadh nan " "rathaidean sa bhaile gu rathaidean-iarainn ann an %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Stèidhich thu %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Chaidh %s a ghluasad à baile fàsaich %s, a chionn 's nach urrainn dhaibh " "fuireach air %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -32355,7 +32342,7 @@ "Nuair a chaidh %s fhàsachadh, cha deach aig %s teicheadh às agus tha iad air " "chall." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -32363,17 +32350,17 @@ "Nuair a chaidh %s fhàsachadh, cha deach aig %s ann an %s teicheadh às agus " "tha iad air chall." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Tha thu a' lèir-sgriosadh %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Chaidh %s a sgriosadh le %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -32382,7 +32369,7 @@ msgstr[2] "Cheannsaich thu %s; fhuair thu %d pìosan òir de spùinn!" msgstr[3] "Cheannsaich thu %s; fhuair thu %d pìos òir de spùinn!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -32391,17 +32378,17 @@ msgstr[2] "Cheannsaich %s %s is fhuair e %d pìosan òir de spùinn on bhaile." msgstr[3] "Cheannsaich %s %s is fhuair e %d pìos òir de spùinn on bhaile." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Cheannsaich thu %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "Cheannsaich %s %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -32410,7 +32397,7 @@ msgstr[2] "Shaor thu %s! Fhuair thu %d pìosan òir de spùinn." msgstr[3] "Shaor thu %s! Fhuair thu %d pìos òir de spùinn." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -32419,56 +32406,56 @@ msgstr[2] "Shaor %s %s is fhuair e %d pìosan òir de spùinn on bhaile." msgstr[3] "Shaor %s %s is fhuair e %d pìos òir de spùinn on bhaile." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Shaor thu %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "Shaor %s %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Chaidh casg a chur air an t-slighe mhalairt eadar %s agus %s." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Chaidh casg a chur air an t-slighe mhalairt eadar %s agus %s." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" "Duilich, chuir %s às dhan t-slighe mhalairt eadar %s agus am baile agad, %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "Duilich, chuir %s às dhan t-slighe mhalairt eadar %s agus am baile agad, %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " o liosta nan obraichean" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "Tha %s a' togail %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -32481,16 +32468,16 @@ msgstr[3] "" "Tha thu a' reic %s ann an %s (glaiste san tìr a-nis) air %d a dh'òr." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Tha mapa baile %s %s a mheud." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "air a dhol am meud" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "air lùghdachadh" @@ -32786,20 +32773,21 @@ msgid "The %s have started building a spaceship!" msgstr "Thòisich %s air soitheach-fànais a thogail!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "Cha dèid aig %s %s a thogail fhathast." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* 'S urrainn dha bailtean ùra a thogail (sluagh de %d ann o thùs).\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "Tha %s deiseil le togail %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, fuzzy, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -32808,60 +32796,60 @@ msgstr[2] "Tha %s a' cosg %d de shluagh. Tha %s a' crìonadh dhan mheud %d." msgstr[3] "Tha %s a' cosg %d de shluagh. Tha %s a' crìonadh dhan mheud %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" "Chan eil airgead gu leòr ann gus %s a chumail ann an %s, togalach air a reic!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Chan eil airgead gu leòr ann. %s air a leigeil mu sgaoil." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Truailleadh faisg air %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Tha %s a' cumail fèill nad onair." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Chaidh an fhèill a chur dheth ann an %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "Dh'èirich plàigh ann an %s! Chaidh muinntir a chall!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Ùpraid chatharra ann an %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "THA AN ÙPRAID CHATHARRA A' CUMAIL A' DOL ANN AN %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%s fo rian a-rithist." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" "Fhuair am pobal làmh an uachdair air do riaghaltas (%s) is tha do dhùthaich " "ann an ùpraid." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32869,13 +32857,13 @@ "a tha againn a leigeil mu sgaoil." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s air a leigeil mu sgaoil gu %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32884,7 +32872,7 @@ "leòr ann!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32894,7 +32882,7 @@ "biadh gu leòr ann!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32904,7 +32892,7 @@ "biadh gu leòr ann!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32913,7 +32901,7 @@ "leasachadh mus fàs e!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32922,7 +32910,7 @@ "feum air leasachadh mus fàs e!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32930,65 +32918,65 @@ "Chan urrainn dha na h-imrich o %s (%s) a dhol gu %s a chionn 's gu bheil " "feum air leasachadh mus fàs e!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "Chaidh %s a leigeil mu sgaoil leis na saoranaich ann." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Dh'fhalbh imrich o %s gu %s air tòir beatha na b' fhearr." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Dh'fhalbh imrich o %s gu %s (%s) air tòir beatha na b' fhearr." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Dh'fhalbh imrich o %s (%s) gu %s air tòir beatha na b' fhearr." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "Chaidh %s a sgriosadh le arm niùclasach aig %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Truailleadh faisg air %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Chaidh muinntir air chall air sgàth gorta ann an %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "Sgrios na %s an %s ann an %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Sgrios an %s agad an %s ann an %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Chaidh cinneasachadh %s a leasachadh gu %s ann an %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -32996,7 +32984,7 @@ "tòir beatha nas fhearr." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -35031,34 +35019,34 @@ msgid "Your %s was captured after completing the mission." msgstr "Chaidh an %s agad a ghlacadh as dèidh dha am misean a choileanadh." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Dh'adhbharaich thu connspaid 's tu a' brìbeadh an %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "Dh'adhbharaich %s connspaid 's e a' brìbeadh an %s agad." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "Dh'adhbharaich thu connspaid 's tu a' feuchainn ri teicneolas a ghoid o: %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "Dh'adhbharaich %s connspaid 's e a' fheuchainn ri teicneolas a ghoid ort." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Dh'adhbharaich thu connspaid 's tu a' brosnachadh aramach ann an %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -35448,20 +35436,20 @@ msgstr "" "Tha crìoch-ùine na cuairte nas lugha na neoini, ga shuidheachadh aig neoini." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" "Cha b' urrainn dhan fhrithealaiche na h-àitichean tòiseachaidh a roinneadh." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Meall-fearainn mòr - faodaidh gum feum seo greis." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Cha do chuir Gineadair 3 gach eilean mòr ann." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Cha do chuir Gineadair 3 %li dhen mheall-fhearainn ann." @@ -35671,13 +35659,13 @@ " Tha obraichean a' tighinn còmhla air an ceann fhìn agus a' leasachadh " "nan rathaidean sa bhaile gu rathaidean-iarainn." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" "Chaidh an %s agad a ghluasad air sgàth 's gu bheil an talamh ag atharrachadh." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -36393,8 +36381,8 @@ "tachairt le seann gheamannan a chaidh a shàbhaladh no faidhle mì-dhligheach " "de gheama a chaidh a shàbhaladh. Lean air adhart air do chunnart fhèin." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -39306,7 +39294,17 @@ msgstr "" "Dh'fhalbh an ùine air a' stad-losgaidh le %s. Tha thu a' cogadh ri %s a-nis." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Dh'fhalbh an ùine air an stad-losgaidh eadar %s agus %s. Tha iad a' cogadh " +"ri chèile a-nis. Tha thusa a' cur crìoch air a' chaidreachas agad leis an dà " +"dhiubh." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -39316,51 +39314,51 @@ "ri chèile a-nis. Tha thusa a' cur crìoch air a' chaidreachas agad leis an dà " "dhiubh." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Seòrsa de dhùmhlachadh (%d) nach eil taic ann ris." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Dh'fhàillig sàbhaladh a' gheama mar %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Chaidh an geama a shàbhaladh mar %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Tha an geama sin a' ruith mu thràth." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "Chaill %s an t-inneal-smachd cmdlevel aig toiseach a' gheama. A' cleachdadh " "bhòtadh a-mach o seo." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "A' tòiseachadh a' gheama." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "iarrtas airson aithisg neo-aithnichte (dhen t-seòrsa %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Rabhadh: a' diùltadh an t-seann chliant %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -39368,54 +39366,54 @@ "Tha an cliant agad ro shean. Feuch is faigh Freeciv 2.2. no tionndadh nas " "ùire dheth ma tha thu airson am frithealaiche seo a chleachdadh." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Chan eil cead deasachaidh agad." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Chan eil %s ri fhaighinn mar nàisean sa chluich seo." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Tha %s aig cuideigin eile mu thràth." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "Tha %s 'na riaghlaiche %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" "Tha geama gu bhith tòiseachadh: tha %d a-mach à %d cluicheadairean deiseil " "ri cluich." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "" "A' lughdachadh aifill a chionn 's nach eil nàiseanan gu leòr ann a ghabhas " "cluiche." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "Tha %s a' riaghladh %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -39423,37 +39421,37 @@ "Tha taic aig a' phrògram-frithealaiche freeciv a chum dearbhadh " "chluicheadairean ach chan eil e 'ga chleachdadh an-dràsta fhèin." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "A' cur an fhiosrachaidh dhan mheata-fhrithealaiche <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" "Cha tòisichear as aonais iarrtas follaiseach airson ceangal meata-" "fhrithealaiche. " -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Seo deireadh a' gheama..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "Dh'fhàillig cruthachadh a' mhapa, a' feuchainn ris a-rithist le sìol mapa " "eile" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Cha ghabh aonad a chruthachadh leis an roghainnean a thagh thu." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Savegame: Chaidh '%s' a shuidheachadh gu %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "A' gabhail ri ceanglaichean ùra o chliantan a-nis" @@ -41381,19 +41379,19 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Chan eil rannsachadh gu leòr a' dol. Chaill sinn 'Teicneolas an ama ri " "teachd' %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Chan eil rannsachadh gu leòr a' dol. Chaill sinn %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -41402,7 +41400,7 @@ "Chaidh an teicneolas a dh'fheumas ar riaghaltas ('%s') air chall. Thòisich " "na saoranaich air reabhlaid a chum '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -41411,34 +41409,34 @@ "Chaidh an teicneolas a dh'fheumas ar riaghaltas ùr ('%s') air chall. Thagh " "na saoranaich '%s' mar an riaghaltas ùr a bu toigh leotha." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" "Chan urrainn %s %s a thogail. Chaidh an teicneolas air a bheil feum air " "chall." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "'S e %s an ceann-uidhe teicneolais." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Ghoid thu %s air %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Ghoid %s %s ort!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Ghoid %s %s air %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -42448,6 +42446,21 @@ msgid "error %d (compiled without strerror)" msgstr "%d mearachd (air a cho-chruinneachadh gun strerror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Seo %s%s, cliant %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Seo %s%s, cliant %s" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Tionndadh Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "Cha dèid aig %s %s a thogail fhathast." + #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/he.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/he.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/he.po freeciv-2.5.8/translations/freeciv/he.po --- freeciv-2.5.7/translations/freeciv/he.po 2017-05-13 12:07:53.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/he.po 2017-08-12 11:54:38.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-12 15:15+0300\n" "Last-Translator: Chen Levy \n" "Language-Team: Hebrew \n" @@ -288,12 +288,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "ה%s הפסיקו לבנות את %s ב%s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "ה%s התחילו לבנות את %s ב%s." @@ -325,7 +325,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -715,13 +715,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1824,10 +1824,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "דגל" @@ -2566,7 +2566,7 @@ msgstr "איזה אומה תהייה?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "בחר אומה" @@ -3214,16 +3214,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "שם" @@ -3342,11 +3342,11 @@ msgstr "אומות" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "סוג" @@ -3519,9 +3519,9 @@ msgid "Seen (Invis)" msgstr "בחר יחידה/ות" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "לא ידוע" @@ -3644,7 +3644,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "" @@ -3668,7 +3668,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4048,12 +4048,12 @@ msgid "Load Lua Script" msgstr "_הטען יחידה" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "בנה עיר חדשה" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4082,8 +4082,8 @@ msgid "Set local options" msgstr "קבע אפשרויות מקומיות" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "הגדרות משחק" @@ -4493,8 +4493,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "התחל משחק לפי _תסריט" @@ -4888,7 +4888,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "%s - %s אזרחים%s" @@ -4899,7 +4899,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4907,374 +4907,367 @@ "%s client" msgstr "%s - %s אזרחים%s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "%s - %s אזרחים%s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "התחל משחק _חדש" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "התחל משחק לפי _תסריט" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_טען משחק שמור" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "הת_חבר למשחק רשת" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "התחבר אל Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "בחר מיקום לשמירה" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_עיין..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "ססמאות אינן תואמות, הזן ססמה." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "שם שרת" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "פורט" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "גרסה" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "מצב" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "שחקנים" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "מחשב־מארח: %s" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "הערה" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_רשת תקשורת מקומית" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_מטה־שרת אינטרנט" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_שרת:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_פורט:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_כניסה:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_ססמה:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_אישור ססמה:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "מחשב מארח" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "הת_חבר" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "שם חיבור: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "שם שחקן: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "מחשב־מארח: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "מידע שחקן/חיבור" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "מידע %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "הפעל/בטל מוכנות שחקן" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "בחר אומה" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "השקף על שחקן זה" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "קח שחקן זה" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "חתוך חיבור" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "הפעל/בטל א\"מ לשחקן" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "הסר שחקן" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "תן מידע לגישה" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "שים על %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "_לא מוכן" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_מוכן" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_התחל" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "קח שחקן זה" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "בחר _אומה" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "קח שחקן זה" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "משקיף: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_השקף" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "_אל תשקיף" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "אקראי" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "השקף" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "התנתק" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_מספר שחקים (כולל א\"מ):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "רמת ה_מיומנות של א\"מ:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "מדבר" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_אפשרויות משחק נספות..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "רשומה" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "דרוג" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "מוכן" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?שחקן:שם" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "צוות" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "בחר משחק שמור לטעינה" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "בחר משחק שמור ל_טעינה:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "בחר בתסריט" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "בחר ב_תסריט" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "שמור שם־_קובץ:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "שמור משחק" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_משחקים שמורים:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "שמור שם־_קובץ:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "התחל משחק לפי _תסריט" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "התחל משחק לפי _תסריט" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "שמור משחק" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_משחקים שמורים:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_משחקים שמורים:" @@ -5808,7 +5801,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_ססמה:" @@ -5848,7 +5841,7 @@ msgstr "הפוך לעיר־בית חדשה" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "קרקע" @@ -6124,8 +6117,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6314,7 +6307,7 @@ msgstr[0] "האם אתה בטוח שברצונך לצאת?" msgstr[1] "האם אתה בטוח שברצונך לצאת?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6330,7 +6323,7 @@ msgid "Yes" msgstr "כן" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6418,13 +6411,13 @@ msgid "This is Qt-client for Freeciv." msgstr "לקוח עבור Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_אל תשקיף" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_השקף" @@ -6458,7 +6451,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "יציאה" @@ -6628,9 +6621,9 @@ msgid "Game" msgstr "משחק" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "אפשריות" @@ -6659,8 +6652,8 @@ msgid "Leave game" msgstr "שמור משחק" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6948,7 +6941,7 @@ msgstr "שיעור מס" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7001,7 +6994,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "רענן" @@ -7012,143 +7005,137 @@ msgstr "החל הפעם" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "%s - %s אזרחים%s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "יחידה %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "%s - %s אזרחים%s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s - %s אזרחים%s" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "התחל משחק חדש" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "התחל משחק לפי _תסריט" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "טען משחק שמור" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "הת_חבר למשחק רשת" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_כניסה:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "ססמה:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_אישור ססמה:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_מטה־שרת אינטרנט" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "השקף" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_עיין..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "התחל משחק לפי _תסריט" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "מנהיג:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "התחל" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "קח שחקן זה" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "שמור שם־_קובץ:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "התחל משחק לפי _תסריט" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "התחל משחק לפי _תסריט" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "השקף" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "_לא מוכן" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", רמת קושי %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "שים על %s" @@ -7260,7 +7247,7 @@ msgid "Back" msgstr "אחורה" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "טען משחק" @@ -8403,47 +8390,41 @@ msgstr "הוסף רשימת־עבודה חדשה" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv גרסה %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "ראשי" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "%s - %s אזרחים%s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "התחל משחק חדש" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "שם כניסה" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr "(משקיף)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 #, fuzzy msgid "Join LAN Server" msgstr "שרתי רת\"מ" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "עיר %s" @@ -15388,83 +15369,83 @@ msgid "?unitflag:Hunter" msgstr "מסוק" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv גרסה %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(גרסת ביתא)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "ראשי" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv גרסה %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "גרסה ביתא־ניסיונית" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "גרסה" -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "ינואר" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "פברואר" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "מרץ" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "אפריל" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "מאי" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "יוני" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "יולי" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "אוגוסט" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "ספטמבר" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "אוקטובר" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "נובמבר" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "דצמבר" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15474,7 +15455,7 @@ "הגרסה %s תשתחרר ב־\n" "%s, ב%s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15484,7 +15465,7 @@ "הגרסה %s תשתחרר ב־\n" "%s, ב%s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "כי על הציביליזציה להיות חופשית!" @@ -16341,61 +16322,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?סגנון־עיר:ארופאי" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?סגנון־עיר:קלאסי" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?סגנון־עיר:טרופי" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?סגנון־עיר:אסיאתי" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?סגנון־עיר:בבלי" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?סגנון־עיר:קלטי" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?סגנון־עיר:רנסאנס" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?סגנון־עיר:תעשייתי" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?סגנון־עיר:מודרני" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?סגנון־עיר:פוסט־מודרני" @@ -18084,18 +18065,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "ירוק" @@ -18726,14 +18707,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "מנהיג ברברי" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20514,9 +20495,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -20908,8 +20889,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?סגנון־עיר:קלטי" @@ -21308,13 +21289,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "זה אתה. אם אתה מאבד יחידה זו, אתה מפסיד את המשחק. אז אל תעשה זאת." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28183,20 +28169,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "לא ידוע" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -28251,11 +28237,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "בחר התקדמות לגנוב" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28287,14 +28273,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "האם אתה בטוח שברצונך לצאת?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -28302,60 +28288,60 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "בחר התקדמות לגנוב" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "בחר התקדמות לגנוב" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "בחר התקדמות לגנוב" @@ -28626,204 +28612,204 @@ msgid "A poorly-named city" msgstr "ניתן שם עלוב לעיר" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "עיר הבית הוחלפה מ%s ל%s" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "הועבר %s ב־ %s מ־ %s אל %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "הועבר %s מ־ %s אל %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "" -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "%s כבש %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s כבש %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "נתיבי הסחר הללו נקבעו עם %s:\n" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "" msgstr[1] "" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "עיר הבית הוחלפה מ%s ל%s" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "בסיס תעופה" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -29071,96 +29057,97 @@ msgid "The %s have started building a spaceship!" msgstr "" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "" +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* יכולים לבנות ערים חדשות.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s סיימו לבנות את %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "אין אפשרות לקיים את תחזוקת %s ב%s, הבניין נמכר!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "זיהום בקרבת %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "הפרות סדר ב%s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "*מהומות נמשכות* ב%s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "הסדר הושב ל%s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29168,7 +29155,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29176,91 +29163,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "זיהום בקרבת %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "אוכלוסייה: %s" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "משחתת" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "הסדר הושב ל%s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "ייצור הושלם:" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30926,32 +30913,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -31270,19 +31257,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -31442,12 +31429,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -32110,8 +32097,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -34466,137 +34453,144 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "" -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "שם זה אסור." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "אוכלוסיה: %s - %s" -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -36384,56 +36378,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -37324,6 +37318,18 @@ msgstr "שגיאה %d (הודר ללא strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s - %s אזרחים%s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s - %s אזרחים%s" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "ראשי" + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/hu.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/hu.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/hu.po freeciv-2.5.8/translations/freeciv/hu.po --- freeciv-2.5.7/translations/freeciv/hu.po 2017-05-13 12:07:53.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/hu.po 2017-08-12 11:54:38.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Freeciv 1.14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-12 15:37+0300\n" "Last-Translator: Gbor Takcs \n" "Language-Team: Hungarian \n" @@ -326,12 +326,12 @@ "szksgnk! Hlld meg dics szvetsgnket, s neved sohasem lesz " "elfelejtve!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "A(z) %s abbahagytk a(z) %s ptst %s vrosban." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "A(z) %s elkezdtk a(z) %s ptst %s vrosban." @@ -365,7 +365,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -768,13 +768,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1942,10 +1942,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Zszl" @@ -2689,7 +2689,7 @@ msgstr "Melyik nemzet leszel?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 #, fuzzy msgid "Pick Nation" @@ -3357,16 +3357,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nv" @@ -3490,11 +3490,11 @@ msgstr "Np" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tpus" @@ -3669,9 +3669,9 @@ msgid "Seen (Invis)" msgstr "Egysg(ek) kivlasztsa" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Ismeretlen" @@ -3797,7 +3797,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Hibajelentseket a(z) <%s> cmre kldj.\n" @@ -3821,7 +3821,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4209,12 +4209,12 @@ msgid "Load Lua Script" msgstr "Szrazfldi egysgek ellen" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "j vros ptse" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4244,8 +4244,8 @@ msgid "Set local options" msgstr "Helyi belltsok" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 #, fuzzy msgid "Game Settings" @@ -4668,8 +4668,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "j jtk indtsa" @@ -5065,7 +5065,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." @@ -5076,7 +5076,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5084,407 +5084,400 @@ "%s client" msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 #, fuzzy msgid "Start _New Game" msgstr "j jtk indtsa" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 #, fuzzy msgid "Start _Scenario Game" msgstr "j jtk indtsa" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 #, fuzzy msgid "_Load Saved Game" msgstr "Jtk betltse" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Kapcsolds hlzati jtkhoz" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 #, fuzzy msgid "Connect to Gaming _Zone" msgstr "Kapcsoldj be itt" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 #, fuzzy msgid "Select Location to Save" msgstr "Vlassz npet s a nevet" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 #, fuzzy msgid "_Browse..." msgstr "_Megjelents..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "A jelszavak nem egyeznek meg, adj meg egy jelszt." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Szervernv" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Verzi" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "llapot" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Jtkosok" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Ember" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Megjegyzs" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Helyi hlzat (LAN)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 #, fuzzy msgid "Internet _Metaserver" msgstr "Metaszerver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 #, fuzzy msgid "_Host:" msgstr "_Szerver" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 #, fuzzy msgid "_Port:" msgstr "_Port" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 #, fuzzy msgid "_Login:" msgstr "Lgi" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Jelsz:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Jelsz me_gerstse:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Szerver" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 #, fuzzy msgid "C_onnect" msgstr "Kapcsolds" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, fuzzy, c-format msgid "Connection name: %s" msgstr "Kapcsolds" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, fuzzy, c-format msgid "Player name: %s" msgstr "?city:Nv" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, fuzzy, c-format msgid "Host: %s" msgstr "Gazdagp:" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Jtkos/kapcsolat informci" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, fuzzy, c-format msgid "%s info" msgstr "Vrosinf" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 #, fuzzy msgid "Toggle player ready" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 #, fuzzy msgid "Pick nation" msgstr "Rendrlloms" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Jtkos megfigyelse" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 #, fuzzy msgid "Take this player" msgstr "Vrosok" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 #, fuzzy msgid "Cut connection" msgstr "A(z) %s kapcsolat megszaktsa." -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 #, fuzzy msgid "Aitoggle player" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 #, fuzzy msgid "Remove player" msgstr "%s jtkos trlse." #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Kvetsg" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, fuzzy, c-format msgid "Put on %s" msgstr "Npessg: %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 #, fuzzy msgid "_Ready" msgstr "Mindenki kszenltbe" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 #, fuzzy msgid "_Start" msgstr "llapot" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "%s Mez" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 #, fuzzy msgid "Pick _Nation" msgstr "Rendrlloms" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Vrosok" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr " (megfigyel)" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 #, fuzzy msgid "_Observe" msgstr " (megfigyel)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "%1$s mostantl %3$s llamformban irnytja a(z) %2$s npt." #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 #, fuzzy msgid "Random" msgstr "Rdi" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 #, fuzzy msgid "Observer" msgstr " (megfigyel)" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 #, fuzzy msgid "Detached" msgstr ", Legyztt" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Ennyire egsztsk ki a jtkosok szmt az MI jtkosok" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "AI kpessg szintje" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Sivatag" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 #, fuzzy msgid "_More Game Options..." msgstr "zenetbelltsok..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 #, fuzzy msgid "Record" msgstr "Jelents" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 #, fuzzy msgid "Rating" msgstr "Vrakozik" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 #, fuzzy msgid "Ready" msgstr "Mindenki kszenltbe" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?city:Nv" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 #, fuzzy msgid "Team" msgstr "Templom" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Vlaszd ki a betltend jtkot" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 #, fuzzy msgid "Choose a Scenario" msgstr "Scenario betltse" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 #, fuzzy msgid "Choose a _Scenario:" msgstr "Scenario betltse" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #, fuzzy msgid "Saved _Games:" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 #, fuzzy msgid "Save _Filename:" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "j jtk indtsa" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "j jtk indtsa" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Jtk elmentse" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Jtk elmentse" @@ -6027,7 +6020,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Jelsz:" @@ -6067,7 +6060,7 @@ msgstr "Ellt vros kijellse" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "t" @@ -6341,8 +6334,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6529,7 +6522,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "Biztosan ki szeretnl lpni?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6545,7 +6538,7 @@ msgid "Yes" msgstr "Igen" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6634,13 +6627,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Egy kliens a Freeciv-hez" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "%1$s mostantl %3$s llamformban irnytja a(z) %2$s npt." -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr " (megfigyel)" @@ -6674,7 +6667,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Kilps" @@ -6840,9 +6833,9 @@ msgid "Game" msgstr "Jtk" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Belltsok" @@ -6872,8 +6865,8 @@ msgid "Leave game" msgstr "Jtk elmentse" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7163,7 +7156,7 @@ msgstr "Adrta..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7216,7 +7209,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Frissts" @@ -7227,144 +7220,138 @@ msgstr "_Egyszeri alkalmazs" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "%s Egysg" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "j jtk indtsa" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "j jtk indtsa" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Jtk elmentse" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Kapcsolds hlzati jtkhoz" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Kapcsolds" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Lgi" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Jelsz:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Jelsz me_gerstse:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Metaszerver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr " (megfigyel)" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Megjelents..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "j jtk indtsa" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Vezet:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Sztkapcsols" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 #, fuzzy msgid "Start" msgstr "llapot" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Vrosok" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Jtk elmentse" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "j jtk indtsa" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "j jtk indtsa" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr " (megfigyel)" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr ", nincs ksz" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr "Nehzsgi szint:" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Npessg: %s" @@ -7478,7 +7465,7 @@ msgid "Back" msgstr "Bank" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Jtk betltse" @@ -8677,46 +8664,40 @@ msgstr "Munkaterv tnevezse" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "j jtk indtsa" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "Csatlakozs" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " (megfigyel)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Csatlakozs LAN szerverhez" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "%s Vros" @@ -15792,83 +15773,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(bta verzi)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "btateszt verzi " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "verzi " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Janur" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februr" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Mrcius" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "prilis" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mjus" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Jnius" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Jlius" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Augusztus" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Szeptember" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktber" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "December" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15878,7 +15859,7 @@ "A Freeciv %s %s hnapban fog\n" "megjelenni. (%s)" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15888,7 +15869,7 @@ "A Freeciv %s %s hnapban fog\n" "megjelenni. (%s)" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "A civilization legyen szabad!" @@ -16739,69 +16720,69 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 #, fuzzy msgid "?citystyle:European" msgstr "?city_state:nnepls" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 #, fuzzy msgid "?citystyle:Classical" msgstr "Klasszikus" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Trpusi" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 #, fuzzy msgid "?citystyle:Asian" msgstr "?city:Nv" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 #, fuzzy msgid "?citystyle:Babylonian" msgstr "?plural:Babilniaiak" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 #, fuzzy msgid "?citystyle:Celtic" msgstr "?city_state:Bke" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 #, fuzzy msgid "?citystyle:Renaissance" msgstr "?city_state:Bke" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 #, fuzzy msgid "?citystyle:Industrial" msgstr "?city:Nv" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 #, fuzzy msgid "?citystyle:Modern" msgstr "?city_state:Zavargs" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 #, fuzzy msgid "?citystyle:PostModern" msgstr "?city_state:Zavargs" @@ -18502,18 +18483,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 #, fuzzy msgid "green" msgstr "Elejre szrs" @@ -19144,14 +19125,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbr Fnk" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20946,9 +20927,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21348,8 +21329,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?city_state:Bke" @@ -21743,13 +21724,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Csak barbrok pthetnek ilyet.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29169,20 +29156,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Ismeretlen" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29237,12 +29224,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Melyik tudomnyt lopjuk el?" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "A(z) %s tszlltsa sikerlt." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29274,14 +29261,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Biztosan ki szeretnl lpni?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29290,60 +29277,60 @@ msgid "Failed to start downloader" msgstr "Hiba trtnt %s MI jtkos ltrehozsa kzben." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Melyik tudomnyt lopjuk el?" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Melyik tudomnyt lopjuk el?" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Melyik tudomnyt lopjuk el?" @@ -29621,52 +29608,52 @@ msgid "A poorly-named city" msgstr "Nvtelen Vros" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "A(z) %s elltvrosa mostantl %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%3$s tadta %2$si %1$s egysgt %4$s jtkosnak." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%2$s tadta egy %1$s egysgt %3$s jtkosnak." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%3$s %4$s egysge megsemmistett egy %2$s %1$s egysgedet." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "j %s plt %s vrosban." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "A szerver tnevezte a vrost, mert volt mr %s nev vrosod. A vros j " "neve: %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -29674,135 +29661,135 @@ " nkntes munksok gylnek ssze, s megptik a vastvonalakat a " "vrosban." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, fuzzy, c-format msgid "You have founded %s." msgstr "Megalaptottad %s vrost" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Jtk: Egy %s kihajzott a feloszlatott %s vrosbl." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, fuzzy, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "%s feloszlatsakor egy %s nem tudott kihajzni, ezrt megsemmislt." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "%s feloszlatsakor egy %s nem tudott kihajzni, ezrt megsemmislt." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "%s vrost teljesen megsemmistetted." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%2$s megsemmistette %1$s vrost." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, fuzzy, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Elfoglaltad %s vrost, %d aranyat zskmnyoltl!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, fuzzy, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s elfoglalta %s vrost, s %d aranyat zskmnyolt." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Atombombt dobtl le %s vrosra." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, fuzzy, c-format msgid "%s conquered %s." msgstr "A(z) %s felfedeztk a(z) %s tudomnyt." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, fuzzy, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Felszabadtottad %s vrost!! %d aranyat zskmnyoltl." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, fuzzy, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s felszabadtotta %s vrost, s %d aranyat zskmnyolt." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, fuzzy, c-format msgid "You have liberated %s!" msgstr "Megalaptottad %s vrost" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, fuzzy, c-format msgid "%s liberated %s." msgstr "%s a(z) %s uralkodja." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Sajnlom, a(z) %s egysged itt nem alapthat kereskedelmi tvonalat." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Sajnlom, a(z) %s egysged itt nem alapthat kereskedelmi tvonalat." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " a munkatervbl" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s vrosban %s%s pl." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -29810,17 +29797,17 @@ "Eladsz egy %s pletet %s vrosban %d aranyrt (a vros mr nem " "tengerparti)." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "A(z) %2$s (llamforma: %1$s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Lgibzis" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30102,98 +30089,99 @@ msgid "The %s have started building a spaceship!" msgstr "A(z) %s rhaj ptsbe kezdtek!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s vrosban mg nem plhet %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Alapthat j vrosokat.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s befejezte a(z) %s ptst." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" "Nem tudsz pnzt fordtani a(z) %2$si %1$s fenntartsra, ezrt azt eladtuk!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Nincs elg arany. %s feloszlatva." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Szennyezs %s kzelben." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Jtk: Az ljen a(z) %s napot megszntettk %s vrosban." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Jtk: Az ljen a(z) %s napot megszntettk %s vrosban." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Polgri lzads %s vrosban." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "A(z) %si POLGRI LZADS TOVBB FOLYTATDIK." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Helyrellt a rend %s vrosban." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" "Orszgodban megdlt a(z) %s, az emberek kztt nagy nyugtalansg uralkodik." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s mg nem pthet %s egysget, nem szntethetjk meg az egyetlen vrosunkat." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "A(z) %s beolvasztva %s vrosba." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30201,7 +30189,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30209,91 +30197,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "A(z) %s beolvasztva %s vrosba." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s vrost atomtmads rte %s rszrl." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Szennyezs %s kzelben." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "hnsg miatt cskken a npessg %s vrosban." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "A(z) %s megsemmistettk a(z) %s pletet %s vrosban." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "A %s megsemmistette a(z) %s pletet %s vrosban." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "A(z) %s helyett inkbb %s pl %s vrosban." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32185,33 +32173,33 @@ msgid "Your %s was captured after completing the mission." msgstr "A %s egysgedet elfogtk, miutn teljestette a kldetst." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "%s %s egysgnek lefizetsvel diplomciai incidenst okozotl." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s diplomciai incidenst okozott egy %s egysged lefizetsvel." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, fuzzy, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "A(z) %s jtkostl val tudomnylopssal diplomciai incidenst okoztl." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, fuzzy, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s diplomciai incidenst okozott a tudomnylopssal." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "A(z) %si lzads kirobbantsval diplomciai incidenst okoztl." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "A(z) %2$si lzads kirobbantsval %1$s diplomciai incidenst okozott." @@ -32535,19 +32523,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "A krkre vonatkoz idkorlt kisebb mint nulla; rgzts nullnl." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Sok szrazfld - ez nhny msodpercet vehet ignybe." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "A 3-as generleljrs nem helyezte el az sszes nagy szigetet." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "A 3-as generleljrs %li szrazfldi mezt nem helyezett el." @@ -32726,14 +32714,14 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, fuzzy, c-format msgid "Moved your %s due to changing terrain." msgstr "" "Arrbbment egy %s egysged, mert a(z) (%d, %d) mez tengerbl szrazfldd " "alakult." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, fuzzy, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -33423,8 +33411,8 @@ "elmentett jtkllsok, vagy rvnytelen jtkllsfjl esetn is. A " "folytats nmileg kockzatos." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "A szerver felvette a jtkba %s MI irnytotta jtkost." @@ -36068,7 +36056,16 @@ "Lejrt a(z) %s jtkossal kttt tzsznet. Mostantl semleges vagy a(z) %s " "fel." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Lejrt a(z) %s jtkossal kttt tzsznet. Mostantl semleges vagy a(z) %s " +"fel." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36077,131 +36074,131 @@ "Lejrt a(z) %s jtkossal kttt tzsznet. Mostantl semleges vagy a(z) %s " "fel." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "a tmogatott opcik: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Nem sikerlt elmenteni a jtkllst %s nven" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "A jtkllst elmentettem %s nven" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "A jtk mr fut." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Jtk indtsa." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, fuzzy, c-format msgid "Warning: rejecting old client %s" msgstr "Figyelmeztets: hnsg van %s vrosban." -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Nincs jogosultsgod a bellts megvltoztatsra." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "A(Z) %s nemzet nem elrhet ezen a plyn." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, fuzzy, c-format msgid "%s nation is already in use." msgstr "A jtk mr fut." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s a(z) %s uralkod %s nven." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, fuzzy, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Nem sikerlt elkezdeni a jtkot: a jtk mr fut." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s a(z) %s uralkodja." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Informci kldse a metszervernek [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Vge a jtknak..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Jtk: Ennek a npnek az egysgeit nem lehet lefizetni." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "A(z) %s bellts j rtke: \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Most fogadom a kliensek kapcsoldst." @@ -38090,56 +38087,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "A(z) %2$s tudomnyt a(z) %1$s tanultk meg elsnek" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Nincs elg aranyad, a felfejleszts kltsge %d." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "A technolgiai cl a(z) %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Elloptad a(z) %s tudomnyt a(z) %s nptl." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "A(z) %s elloptk tled a(z) %s tudomnyt!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "A(z) %s elloptk a(z) %s tudomnyt a(z) %s nptl." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39050,6 +39047,21 @@ msgstr "hiba: %d (strerror nlkl lett lefordtva)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Ez a parancs pillanatnyilag mg nincs megvalstva." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s vrosban mg nem plhet %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/id.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/id.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/id.po freeciv-2.5.8/translations/freeciv/id.po --- freeciv-2.5.7/translations/freeciv/id.po 2017-05-13 12:07:53.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/id.po 2017-08-12 11:54:39.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-07-26 20:54+0100\n" "Last-Translator: Dadan Haryana \n" "Language-Team: Indonesian <>\n" @@ -329,12 +329,12 @@ "*%s (AI)* Kami telah diserang dengan kejam oleh %s, dan kami butuh " "bantuanmu! Hargailah persekutuan kita dan namamu takkan terlupakan!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s telah menghentikan pembangunan %s di %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s telah memulai pembangunan %s di %s." @@ -368,7 +368,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -749,13 +749,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1831,10 +1831,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bendera" @@ -2543,7 +2543,7 @@ msgstr "Anda akan Jadi Bangsa Apa?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Pilih Bangsa" @@ -3173,16 +3173,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nama" @@ -3293,11 +3293,11 @@ msgstr "Bangsa" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Jenis" @@ -3456,9 +3456,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Tidak diketahui" @@ -3577,7 +3577,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Laporkan masalah di %s\n" @@ -3601,7 +3601,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -3971,12 +3971,12 @@ msgid "Load Lua Script" msgstr "Muat Skrip Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Bangun Kota Baru" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4005,8 +4005,8 @@ msgid "Set local options" msgstr "Atur opsi lokal" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Pengaturan Permainan" @@ -4381,8 +4381,8 @@ msgid "Game/Scenario Properties" msgstr "Properti Permainan/Skenario" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Simpan Skenario" @@ -4740,7 +4740,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, klien %s" @@ -4751,7 +4751,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4759,364 +4759,357 @@ "%s client" msgstr "%s%s, klien %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s, klien %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Mulai Permainan _Baru" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Mulai Permainan _Skenario" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Muat Permainan Tersimpan" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "S_ambung ke Permainan Jaringan" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Pilih Lokasi Penyimpanan" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Ramban..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Kata sandi tidak cocok, masukkan kata sandi." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nama Server" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versi" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Pemain" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Manusia" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Komentar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Jaringan _Lokal" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Metaserver Internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Kata _sandi:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Konf_irmasi Kata Sandi:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "S_ambung" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nama sambungan: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nama pemain: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Info %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Pilih bangsa" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Amati pemain ini" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Putuskan sambungan" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Beri akses %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Taruh pada %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Belum _siap" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Siap" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Mulai" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "_Ambil %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Pilih _Bangsa" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Ambil Pemain" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "_Amati %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Amati" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Jangan _amati" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Acak" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Pengamat" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Jumlah _Pemain (termasuk AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_Tingkat Kemampuan AI:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Penguasa:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Opsi Lebih Banyak..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Siap" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Pemimpin" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Tim" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Pilih Permainan yang Akan Dimuat" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Pilih Permainan yang Akan _Dimuat:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Pilih Skenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Pilih _Skenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nama berkas:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Simpan Permainan" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Permainan Tersimpan:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Simpan Ske_nario:" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Simpan Sk_enario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Simpan Gambar Peta" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "_Gambar Peta Tersimpan:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Simpan Gambar _Peta:" @@ -5623,7 +5616,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Informasi tambahan tersedia dengan mengklik-kiri pada penduduk." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Kata _sandi:" @@ -5664,7 +5657,7 @@ msgstr "Ubah produksi" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Muat" @@ -5929,8 +5922,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6118,7 +6111,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "Anda yakin ingin keluar?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6134,7 +6127,7 @@ msgid "Yes" msgstr "Ya" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6220,13 +6213,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Ini adalah klien Qt untuk Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Jangan _amati" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Amati" @@ -6260,7 +6253,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Keluar" @@ -6421,9 +6414,9 @@ msgid "Game" msgstr "Permainan" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opsi" @@ -6452,8 +6445,8 @@ msgid "Leave game" msgstr "Tinggalkan Permainan" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6726,7 +6719,7 @@ msgstr "Tarif Pajak..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6778,7 +6771,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Segarkan" @@ -6788,141 +6781,135 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "%s%s, klien %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unit: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "%s%s, klien %s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s, klien %s" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Mulai Permainan Baru" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Mulai Permainan _Skenario" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Muat permainan tersimpan FILE" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "S_ambung ke Permainan Jaringan" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Sambung" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_Login:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Kata Sandi" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Konf_irmasi Kata Sandi:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_Metaserver Internet" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Pengamat Global" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Ramban..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Simpan Skenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "_Pemimpin:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Putuskan" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Mulai" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Simpan Permainan" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Nama Skenario" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Nama Skenario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Pengamat Global" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Belum _siap" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", tingkat kesulitan %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Taruh pada %s" @@ -7032,7 +7019,7 @@ msgid "Back" msgstr "Mundur" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Muat Permainan" @@ -8134,44 +8121,38 @@ msgstr "Tambah daftar kerja baru" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Versi Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "%s%s, klien %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Mulai Permainan Baru" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Bergabung ke Permainan" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Bergabung dengan Server Umum" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Bergabung dengan Server LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient menyambut anda..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Kota: %s" @@ -14734,83 +14715,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versi %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versi beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Versi Freeciv %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Versi Freeciv %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versi uji beta" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versi " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Januari" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februari" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Maret" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "April" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mei" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Agustus" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "September" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "November" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Desember" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -14819,7 +14800,7 @@ "INI ADALAH VERSI BETA\n" "Freeciv %s akan diluncurkan pada %s, di %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -14828,7 +14809,7 @@ "INI ADALAH VERSI BETA\n" "Freeciv %s akan diluncurkan pada %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Karena peradaban seharusnya bebas!" @@ -15643,61 +15624,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Eropa" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Klasik" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropis" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Asia" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babilonia" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Keltik" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renaisans" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industri" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "PostModern" @@ -17458,18 +17439,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "hijau" @@ -18139,14 +18120,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Pemimpin Barbar" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -19905,9 +19886,9 @@ "Penjelajah adalah pemberani yang berguna untuk memetakan daerah yang belum " "diketahui." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20257,8 +20238,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "" @@ -20640,13 +20621,19 @@ msgstr "" "Ini adalah Anda. Jika unit ini mati, Anda kalah. Jadi jagalah baik-baik." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Hanya suku Barbar yang dapat membangunnya.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -27502,19 +27489,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Tidak diketahui" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -27569,12 +27556,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Pemasang modpack Freeciv" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s berhasil diangkut." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -27608,14 +27595,14 @@ msgid "Automatically install modpack from a given URL" msgstr "Muat daftar modpack dari URL" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Anda yakin ingin keluar?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Unduhan lain sedang berjalan" @@ -27623,61 +27610,61 @@ msgid "Failed to start downloader" msgstr "Gagal menjalankan pengunduh" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 #, fuzzy msgid "Installed" msgstr "Pasang modpack" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 #, fuzzy msgid "?modpack:Type" msgstr "Modpack" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Lisensi" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Pasang modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL modpack" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Pilih modpack yang akan dipasang" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Pemasang modpack Freeciv" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Pemasang modpack Freeciv" @@ -27946,200 +27933,200 @@ msgid "A poorly-named city" msgstr "" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s di %s telah diangkut dari %s ke %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s telah diangkut dari %s ke %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Pengganti %s telah dibangun di %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Anda sudah punya kota bernama %s. Nama kota diubah menjadi %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Orang-orang di %s terkagum dengan wawasan teknologi anda!\n" " Para pekerja segera berkumpul dan memperbaiki kota dengan rel kereta." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Anda telah mendirikan %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s telah dihancurkan oleh %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s menaklukkan %s dan merampas %d emas dari kotanya." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Anda telah menaklukkan %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s menaklukkan %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Anda telah memerdekakan %s! Total harta rampasan berjumlah %d emas." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Anda telah memerdekakan %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s telah memerdekakan %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Jalur dagang antara %s dan %s dibatalkan." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Jalur dagang antara %s dan %s dibatalkan." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Maaf, %s membatalkan jalur dagang dari %s ke kota anda, %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Maaf, %s membatalkan jalur dagang dari %s ke kota anda, %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "dari daftar kerja" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Ukuran peta kota %s adalah %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -28385,88 +28372,89 @@ msgid "The %s have started building a spaceship!" msgstr "%s mulai membangun kapal angkasa!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s belum bisa membangun %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Dapat membangun kota baru.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s selesai membangun %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Tidak ada uang untuk mengurus %s di %s, bangunan dijual!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Polusi di dekat %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Perayaan dibatalkan di %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Kerusuhan melanda %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "KERUSUHAN DI %s BERLANJUT." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Kerusuhan di %s berakhir." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Rakyat telah menggulingkan %s Anda, negara Anda sedang kacau." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -28475,7 +28463,7 @@ "tidak cukup!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -28485,7 +28473,7 @@ "tersedia tidak cukup!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -28495,95 +28483,95 @@ "tersedia tidak cukup!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" "Migran dari %s bermigrasi ke %s untuk mencari kehidupan yang lebih baik." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" "Migran dari %s bermigrasi ke %s (%s) untuk mencari kehidupan yang lebih baik." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" "Migran dari %s (%s) bermigrasi ke %s untuk mencari kehidupan yang lebih baik." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s Anda telah disuap oleh %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Polusi di dekat %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Kelaparan menyebabkan penyusutan populasi di %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s menghancurkan %s di %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "%s Anda menghancurkan %s di %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Halaman produksi" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" "Penduduk %s berpikir untuk bermigrasi ke %s untuk hidup yang lebih baik." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30292,32 +30280,32 @@ msgid "Your %s was captured after completing the mission." msgstr "%s Anda ditangkap setelah menyelesaikan misinya." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Anda menimbulkan insiden ketika menyuap %2$s %1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s menimbulkan insiden ketika menyuap %s Anda." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Anda menimbulkan insiden ketika akan mencuri teknologi dari %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s menimbulkan insiden ketika akan mencuri teknologi Anda." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Anda menimbulkan insiden ketika menyulut revolusi di %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s telah menimbulkan insiden ketika menyulut revolusi di %s." @@ -30637,19 +30625,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Waktu habis giliran lebih kecil dari nol, dijadikan nol." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Massa daratan tinggi - ini bisa memakan waktu beberapa detik." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -30831,12 +30819,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "%s Anda dipindahkan karena medan yang berubah." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -31485,8 +31473,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s ditambahkan sebagai pemain yang dikendalikan AI berlevel %s (%s)" @@ -33817,7 +33805,16 @@ msgstr "" "Gencatan senjata dengan %s telah berakhir. Sekarang Anda berperang dengan %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Gencatan senjata antara %s dan %s telah berakhir. Sekarang mereka berperang. " +"Anda memutuskan persekutuan dengan keduanya." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -33826,49 +33823,49 @@ "Gencatan senjata antara %s dan %s telah berakhir. Sekarang mereka berperang. " "Anda memutuskan persekutuan dengan keduanya." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Jenis pemampatan %d tidak didukung." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Gagal menyimpan permainan sebagai %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Permainan disimpan sebagai %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Permainan sedang berjalan." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Memulai permainan." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Peringatan: menolak klien lama %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -33876,49 +33873,49 @@ "Klien Anda terlalu lama. Untuk menggunakan server ini, harap perbarui klien " "anda menjadi Freeciv 2.2 atau lebih baru." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Anda tidak diizinkan untuk menyunting." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Bangsa %s tidak tersedia di skenario ini." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Bangsa %s sudah digunakan." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Menunggu permainan dimulai: %d dari %d pemain sudah siap." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s memimpin %s" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -33926,33 +33923,33 @@ "Program freeciv-server ini mendukung otentikasi pemain, tetapi sedang tidak " "digunakan." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Mengirim info ke metaserver <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Permainan berakhir..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "%s telah dihancurkan oleh %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Sekarang menerima sambungan klien baru." @@ -35728,56 +35725,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Anda mencuri %s dari %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s telah mencuri %s dari anda!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s telah mencuri %s dari %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -36646,6 +36643,21 @@ msgid "error %d (compiled without strerror)" msgstr "galat %d (dikompilasi tanpa sterror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s, klien %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s, klien %s" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Versi Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s belum bisa membangun %s." + #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/it.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/it.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/it.po freeciv-2.5.8/translations/freeciv/it.po --- freeciv-2.5.7/translations/freeciv/it.po 2017-05-13 12:07:54.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/it.po 2017-08-12 11:54:39.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: it.po 35542 2017-05-13 11:22:58Z jtn $ +# $Id$ # # *** Traduzione Italiana di Freeciv *** # *** Freeciv Italian Translation *** @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-03-26 15:29+0100\n" "Last-Translator: Paolo Sammicheli \n" "Language-Team: Italian \n" @@ -353,12 +353,12 @@ "vostro aiuto! Onorate la nostra gloriosa alleanza e il vostro nome non sarà " "dimenticato!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "gli %s hanno smesso di costruire %s a %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "gli %s hanno cominciato a costruire %s a %s." @@ -394,7 +394,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -790,13 +790,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1934,10 +1934,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bandiera" @@ -2658,7 +2658,7 @@ msgstr "Che nazione volete essere?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Scegli nazione" @@ -3324,16 +3324,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nome" @@ -3445,11 +3445,11 @@ msgstr "Nazioni" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipo" @@ -3622,9 +3622,9 @@ msgid "Seen (Invis)" msgstr "Vista (Invisibili)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Sconosciuto" @@ -3746,7 +3746,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Riferite i bug a %s\n" @@ -3770,7 +3770,7 @@ msgstr "Maiuscolo+Invio" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4145,12 +4145,12 @@ msgid "Load Lua Script" msgstr "_Carica unità" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Costruzione nuova città" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4181,8 +4181,8 @@ msgid "Set local options" msgstr "Imposta le opzioni locali" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Impostazioni di gioco" @@ -4567,8 +4567,8 @@ msgid "Game/Scenario Properties" msgstr "Proprietà Gioco/Scenario" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Salva scenario" @@ -4937,7 +4937,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Questo comando è consentito solo ai client." @@ -4948,7 +4948,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4956,370 +4956,363 @@ "%s client" msgstr "Questo comando è consentito solo ai client." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Questo comando è consentito solo ai client." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Inizia _nuova partita" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Inizia nuovo _scenario" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Carica _partita" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onnessione a una partita in rete" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Connessione a una _zona di gioco" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Scegliete una nazione ed un nome" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Sfoglia..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Le password non coincidono, inserisci password." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nome server" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Porta" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versione" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Stato" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Giocatori" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Umano" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Commento" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Rete locale" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Porta:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Ingresso:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Pass_word:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_erma Password:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Computer" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_ollega" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nome connessione: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nome giocatore: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Server: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Informazioni giocatore/connessione" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Informazioni %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Commuta giocatori pronti" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Scegli una nazione" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Osserva questo giocatore" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Prendi questo giocatore" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Chiusura collegamenti" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Commuta in IA giocatore" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Rimuove giocatore" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Concedi ambasciata" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Assegna a %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Non _pronto" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Pronto" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Inizia" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Quadrante %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "_Seleziona nazione" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Seleziona _giocatore" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Osservatore: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Osservatore" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Non _osservare" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s IA>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Casuale" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Osservatore" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Scollegato" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Numero di giocatori (incluse le IA):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "livello _AI:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Deserto" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Ulteriori _opzioni gioco..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Racord" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Punteggio" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Pronto" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?Player:Leader" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Squadra" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Scegli la partita salvata da caricata" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Scegli la partita salvata da _caricare" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Scegli uno scenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Scegli uno _scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nome file:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Salva partita" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Salva partita:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Salva nome _file:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Salva scenario" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Salva scenario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Salva partita" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Salva partita:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Salva partita:" @@ -5852,7 +5845,7 @@ msgstr "" "Informazioni addizionali sono disponibili con il clic sinistro sui cittadini." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Pass_word:" @@ -5893,7 +5886,7 @@ msgstr "Rendi città d'origine" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Carica" @@ -6166,8 +6159,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6355,7 +6348,7 @@ msgstr[0] "Sei sicuro di voler terminare?" msgstr[1] "Sei sicuro di voler terminare?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6371,7 +6364,7 @@ msgid "Yes" msgstr "Sì" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6459,13 +6452,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Client SDL di Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Non _osservare" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Osservatore" @@ -6499,7 +6492,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Esci dal programma" @@ -6668,9 +6661,9 @@ msgid "Game" msgstr "Gioco" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opzioni" @@ -6699,8 +6692,8 @@ msgid "Leave game" msgstr "Abbandona la partita" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6980,7 +6973,7 @@ msgstr "Tasso di imposte..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7032,7 +7025,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Ridisegna" @@ -7043,143 +7036,137 @@ msgstr "Applica per una volta" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Questo comando è consentito solo ai client." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unità %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Questo comando è consentito solo ai client." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Questo comando è consentito solo ai client." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Inizia nuova partita" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Inizia nuovo _scenario" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Carica partita salvata" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "C_onnessione a una partita in rete" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Collega" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Ingresso:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Password:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Conf_erma Password:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Osservatore globale" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Sfoglia..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Salva scenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Leader:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Disconnettersi" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Inizia" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Salva giocatori" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Salva nome _file:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Nome scenario" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Nome scenario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Osservatore globale" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Non _pronto" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", livello di difficoltà %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Assegna a %s" @@ -7291,7 +7278,7 @@ msgid "Back" msgstr "Indietro" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Carica partita" @@ -8432,44 +8419,38 @@ msgstr "Aggiungi lista lavori" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versione %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Questo comando è consentito solo ai client." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Inizia nuova partita" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Connessione ad una partita" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Connessione al Pubserver" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Connessione ad un server locale" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Il client SDL ti dà il benvenuto..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Città: %s" @@ -15475,83 +15456,83 @@ msgid "?unitflag:Hunter" msgstr "Elicottero" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versione %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versione beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versione %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versione %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versione beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versione " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "gennaio" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "febbraio" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "marzo" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "aprile" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "maggio" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "giugno" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "luglio" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "agosto" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "settembre" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "ottobre" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "novembre" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "dicembre" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15560,7 +15541,7 @@ "QUESTA È UNA VERSIONE BETA\n" "Freeciv %s sarà pubblicato a %s, presso %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15569,7 +15550,7 @@ "QUESTA È UNA VERSIONE BETA\n" "Freeciv %s sarà pubblicato a %s, presso %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Perché la civilizzazione deve essere libera!" @@ -16481,61 +16462,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Europea" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Classica" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropicale" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Asiatica" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babilonese" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Celtica" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renascimentale" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Industriale" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Moderna" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:PostModerna" @@ -18368,18 +18349,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "recluta" @@ -19095,14 +19076,14 @@ "in un solo turno!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Leader Barbaro" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21092,9 +21073,9 @@ "Gli esploratori sono dei coraggiosi individui molto utili per esplorare il " "territorio sconosciuto." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21522,8 +21503,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "?citystyle:Età Elettricità" @@ -21957,13 +21938,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "Questo sei tu. Se predi questa unità perderai la partita. Non farlo." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Solo i barbari possono costruirlo.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30695,20 +30682,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Sconosciuto" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -30763,12 +30750,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Scegliete la tecnologia da rubare" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s trasportato con successo." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -30800,14 +30787,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Sei sicuro di voler terminare?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -30815,60 +30802,60 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Scegliete la tecnologia da rubare" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Scegliete la tecnologia da rubare" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Scegliete la tecnologia da rubare" @@ -31153,50 +31140,50 @@ msgid "A poorly-named city" msgstr "Una città con uno strano nome" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "la città d'origine di %s è diventata %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s a %s è stato trasferito da %s a %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s è stato trasferito da %s a %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s perduti nel trasferimento a %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "avete perso un %s assieme al controllo di %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Un nuovo %s è stato costruito a %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Hai già una citta chiamata %s. La città è stata rinominata %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -31204,34 +31191,34 @@ " I lavoratori si riuniscono spontaneamente e installano una linea\n" " ferroviaria in città." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Hai fondato %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "%s è stato spostato fuori dalla città abbandonata di %s in quanto non può " "stare in %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -31239,7 +31226,7 @@ "Quando %s è stata abbandonata il tuo %s non ha potuto uscirne ed è stato " "perso." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -31247,120 +31234,120 @@ "Quando %s è stata abbandonata il tuo %s non ha potuto uscirne ed è stato " "perso." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "avete completamente distrutto %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s è stata distrutta da %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Avete conquistato %s; i tuoi saccheggi ammontano a %d auri." msgstr[1] "Avete conquistato %s; i tuoi saccheggi ammontano a %d auri." -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s ha conquistato %s e saccheggiato %d auri dalla città." msgstr[1] "%s ha conquistato %s e saccheggiato %d auri dalla città." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Avete conquistato %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s ha conquistato %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Avete liberato %s! Il saccheggio ammonta a %d auri." msgstr[1] "Avete liberato %s! Il saccheggio ammonta a %d auri." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s ha liberato %s e saccheggiato %d auri dalla città." msgstr[1] "%s ha liberato %s e saccheggiato %d auri dalla città." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Hai liberato %s" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s ha liberato %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Rotta commerciale tra %s e %s cancellata." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Rotta commerciale tra %s e %s cancellata." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" "Spiacent, i %s hanno cancellato la rotta commerciale da %s alla vostra %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "Spiacent, i %s hanno cancellato la rotta commerciale da %s alla vostra %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " dalla lista di lavoro" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s sta costruendo %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "avete venduto %s a %s (che ora è nell'entroterra) per %d auri." msgstr[1] "avete venduto %s a %s (che ora è nell'entroterra) per %d auri." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "La dimensione della mappa di %s è %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "aumentata" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "ridotta" @@ -31647,77 +31634,78 @@ msgid "The %s have started building a spaceship!" msgstr "gli %s hanno iniziato a costruire un'astronave!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s non può ancora costruire %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Può costruire nuove città.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s ha finito di costruire %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, fuzzy, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "%s costa %d di popolazione. %s si riduce alla dimensione %d." msgstr[1] "%s costa %d di popolazione. %s si riduce alla dimensione %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "non potete permettervi la manutenzione di %s a %s, edificio venduto!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Auri insufficienti. %s congedato." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "inquinamento nei dintorni di %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Viene celebrata festa in tuo onore in %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "È stata cancellata la festa in tuo onore in %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s è flagellata dalla peste! Diminuzione di popolazione!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "sommossa a %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "CONTINUA LA SOMMOSSA a %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "sommossa sedata a %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "il popolo ha rovesciato il vostro %s, la nazione è in rivolta." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -31725,13 +31713,13 @@ "città." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s è stata abbandonata e i suoi abitanti hanno formato un %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31739,7 +31727,7 @@ "Gli emigranti da %s non possono andare a %s per indisponibilità di cibo!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31748,7 +31736,7 @@ "Gli emigranti da %s non possono andare a %s (%s) per indisponibilità di cibo!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31757,7 +31745,7 @@ "Gli emigranti da %s (%s) non possono andare a %s per indisponibilità di cibo!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31766,7 +31754,7 @@ "struttura cittadina per crescere!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31775,7 +31763,7 @@ "struttura cittadina per crescere!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -31783,68 +31771,68 @@ "Gli emigranti da %s (%s) non possono andare a %s perché necessita di una " "struttura cittadina per crescere!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s è stata abbandonata dai suoi abitanti." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" "Emigranti si sono spostati da %s a %s alla ricerca di una vita migliore." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" "Emigranti si sono spostati da %s a %s (%s) alla ricerca di una vita migliore." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" "Emigranti si sono spostati da %s (%s) a %s alla ricerca di una vita migliore." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s è stata distrutta con un ordigno nucleare da %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "inquinamento nei dintorni di %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "la carestia provoca una diminuzione della popolazione a %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "il %s ha distrutto il %s a %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "il vostro %s ha distrutto il %s a %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "la produzione di %s è salita a %s in %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -31852,7 +31840,7 @@ "migliore." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33724,40 +33712,40 @@ msgid "Your %s was captured after completing the mission." msgstr "la vostra %s è stata catturata dopo aver compiuto la sua missione." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" "avete provocato un incidente diplomatico tentando di corrompere un %2$s di " "%1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" "%s ha provocato un incidente diplomatico tentando di corrompere il vostro %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "avete provocato un incidente diplomatico tentando di rubare una tecnologia a " "%s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s ha provocato un incidente diplomatico tentando di rubarvi una tecnologia." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "avete provocato un incidente diplomatico tentando di incitare una rivolta a " "%s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -34139,19 +34127,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Il timeout del turno è minore di zero, riportato a zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Valore di landmass alto - questo potrebbe richiedere alcuni secondi." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Il generatore 3 non ha posizionato tutte le isole grandi." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Il generatore 3 ha lasciato %li terre non piazzate." @@ -34337,12 +34325,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Spostato un vostro %s a causa del cambiamento del terreno." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -35021,8 +35009,8 @@ "accadere con alcuni vecchi salvataggi di partite, o può indicare un file di " "salvataggio non valido. Procedete a vostro rischio." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -37788,7 +37776,16 @@ msgstr "" "Il cessate il fuoco con %s è terminato. Siete adesso in guerra con i %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Il cessate il fuoco tra %s e %s è terminato. Si trovano in stato di guerra. " +"Avete cancellato l'alleanza con entrambi." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -37797,51 +37794,51 @@ "Il cessate il fuoco tra %s e %s è terminato. Si trovano in stato di guerra. " "Avete cancellato l'alleanza con entrambi." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "Tipo di compressione non supportata: %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Ho fallito nel salvataggio del gioco come %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Gioco salvato come %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Il gioco sta già girando." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "%s ha perso il controllo sulle impostazioni della partita. Entra in uso il " "metodo della votazione." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Inizio gioco." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "richiesta per rapporto sconosciuto (tipo %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Attenzione: vecchio client %s rifiutato" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -37849,51 +37846,51 @@ "Il tuo client è troppo vecchio. Per utilizzare questo server è necessario " "passare a Freeciv 2.2 o successivo." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Non siete abilitati al livello edit." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "La nazione %s non è disponibile in questo scenario." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "La nazione %s è già in uso." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s è il governatore %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" "In attesa di avvio del gioco: %d di %d giocatori sono pronti ad iniziare." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "Riduzione del parametro aifill perché non ci sono abbastanza nazioni." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s guida gli %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 #, fuzzy msgid "" "This freeciv-server program has player authentication support, but it's " @@ -37902,37 +37899,37 @@ "Questo server ha il supporto per l'autenticazione dei giocatori, ma " "attualmente non è in uso." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Invio informazioni al metaserver <%s> in corso" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" "Non si avvia senza un richiesta esplicita dalla connessione metaserver." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "il gioco è finito..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "" "Impossibile creare l'unità in %s perché l'identificativo tipo unità %d non è " "valido." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opzione: %s è stata impostata a \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Da ora sono accettate nuove connessioni dai client." @@ -39811,56 +39808,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Aumenta l'apporto di scienza in una città del 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "l'obiettivo Tecnologico è %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "hai rubato %s dagli %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "gli %s hanno rubato %s a te!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "gli %s hanno rubato %s dagli %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -40785,6 +40782,21 @@ msgstr "errore %d (compilato senza strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Questo comando è consentito solo ai client." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Questo comando è consentito solo ai client." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versione %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s non può ancora costruire %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ja.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ja.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ja.po freeciv-2.5.8/translations/freeciv/ja.po --- freeciv-2.5.7/translations/freeciv/ja.po 2017-05-13 12:07:54.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ja.po 2017-08-12 11:54:40.000000000 +0000 @@ -156,7 +156,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.0.99-devel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-07-18 02:12+0900\n" "Last-Translator: Belgae \n" "Language-Team: SAWADA Katsuya \n" @@ -510,12 +510,12 @@ "*%s (AI)* 我々は%sの猛攻を受けており，貴国の助力を必要としている！我々の栄光" "ある同盟を守りたまえ，貴君の名は永遠のものとなるであろう！" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%sは%sを %sに建てるのを中断しました。" -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%sは%sを%sに建て始めました。" @@ -551,7 +551,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -968,13 +968,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -2130,10 +2130,10 @@ msgstr "数" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "旗" @@ -2869,7 +2869,7 @@ msgstr "あなたがなりたい民族は?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "民族選択" @@ -3534,16 +3534,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "名前" @@ -3659,11 +3659,11 @@ msgstr "民族" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "タイプ" @@ -3841,9 +3841,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "不明" @@ -3966,7 +3966,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "%s へバグを報告してください。\n" @@ -3994,7 +3994,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "ビュー" @@ -4394,12 +4394,12 @@ msgid "Load Lua Script" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "新たな都市を建設する" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4428,8 +4428,8 @@ msgid "Set local options" msgstr "ローカルオプション" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "ゲーム設定" @@ -4825,8 +4825,8 @@ msgstr "ゲーム/シナリオのプロパティ" # Daniel -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "シナリオの保存" @@ -5190,7 +5190,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s %sクライアント" @@ -5201,7 +5201,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -5209,296 +5209,289 @@ "%s client" msgstr "" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), %s クライアント" - # Daniel -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "新しいゲームの開始(_N)" # Daniel -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "シナリオのロード(_S)" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "セーブファイルのロード(_L)" # Daniel -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "ネットワークゲームへ接続(_O)" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Gaming _Zoneへ接続" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "保存先を選択してください" # Daniel -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "ブラウズ(_B)..." # clefs -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "パスワードが一致しません。パスワードを入力してください。" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "サーバー名" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "ポート" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "バージョン" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "状態" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "プレイヤー数" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "人間" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "コメント" # ntaka, Daniel -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "L_AN" # Daniel -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "メタサーバー(_M)" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "ホスト(_H):" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "ポート(_P):" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "接続名(_L):" # Daniel -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "パスワード(_W):" # Daniel -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "パスワードの確認(_I):" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "ホスト" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "接続(_O)" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "接続名: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "プレイヤー名: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "ホスト: %s" # clefs -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "プレイヤー/接続情報" # clefs -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s情報" # clefs # Belgae -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "プレイヤーの準備状態を切り替える" # clefs -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "民族選択" # clefs -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "このプレイヤーを観察する" # clefs -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "このプレイヤーを操作する" # clefs -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "接続切断" # clefs -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "プレイヤーのAI状態を切り替える" # clefs -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "プレイヤー除去" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "%sレベルのアクセスを与える" # clefs #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "%s に加える" # clefs # XXX ネット対戦で「まだだよ」と待ってもらうボタン -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "準備中(_R)" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "準備完了(_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "開始(_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "%sの操作(_T)" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "民族の選択(_N)" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "プレイヤーの操作(_T)" # Daniel -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "%sの観察(_O)" # Daniel -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "観察(_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "観察終了(_O)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%sAI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "ランダム" # Daniel -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "観察者" # clefs XXX # Belgae # was 未割り当て -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "解任済" # Daniel #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5508,104 +5501,104 @@ # Daniel # Belgae -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "AIのレベル(_L):" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "ルールセット :" # clefs -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "詳細なゲーム設定..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "記録" # まだ使われていない関数なのかな -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "レーティング" # clefs -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "準備完了" # clefs -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "プレイヤー名" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "チーム" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "ロードするセーブファイルを選択" # Daniel -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "ロードするセーブファイルを選択(_L):" # Daniel -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "ロードするシナリオを選択" # Daniel -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "シナリオを選択(_S):" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "ファイル名:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "ゲームの保存" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "保存されたゲーム(_G):" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "保存するファイル名:" # Daniel -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "保存されたシナリオ:" # Daniel -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "保存するシナリオ名:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "マップ画像出力" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "保存された画像:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "ファイル名:" @@ -6144,7 +6137,7 @@ msgstr "詳細な情報は市民を左クリックすると表示されます。" # Daniel -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "パスワード(_W):" @@ -6182,7 +6175,7 @@ msgstr "この都市に所属させる" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "載せる" @@ -6426,8 +6419,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6609,7 +6602,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "これらの%1ユニットを解散しますか？" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6625,7 +6618,7 @@ msgid "Yes" msgstr "はい" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6716,13 +6709,13 @@ msgid "This is Qt-client for Freeciv." msgstr "これはFreeciv Qtクライアントです。" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "観察終了" # Daniel -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "観察" @@ -6761,7 +6754,7 @@ "オプションを受け付けます。GTKのマニュアルを参照してください。\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "終了" @@ -6911,9 +6904,9 @@ msgid "Game" msgstr "ゲーム" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "オプション" @@ -6939,8 +6932,8 @@ msgid "Leave game" msgstr "落ちる" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7206,7 +7199,7 @@ msgstr "税率..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "プレイヤー" @@ -7255,7 +7248,7 @@ msgid "... read more in help" msgstr "... 続きはヘルプで" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "更新" @@ -7265,136 +7258,130 @@ msgstr "適用" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s Qtクライアント" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Qtクライアント" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s) Qtクライアント" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "新しいゲームの開始" # Daniel -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "シナリオのロード" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "セーブファイルのロード" # Daniel -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "ネットワークゲームへ接続" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "接続" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "接続名" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "パスワード:" # Daniel -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "パスワードの確認" # Daniel -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "メタサーバー(_M)" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "全体観察者" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "更新日時" # Daniel -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "ブラウズ(_B)..." # Daniel -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "ロード" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "元首" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "切断" # clefs -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "開始" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "ロードするセーブファイルを選択" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "ロードするシナリオを選択" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "全体観察者" # clefs # XXX ネット対戦で「まだだよ」と待ってもらうボタン -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "準備中" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "AIのレベル" # clefs -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "チームに加える" @@ -7502,7 +7489,7 @@ msgid "Back" msgstr "戻る" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "ゲームをロードする" @@ -8652,44 +8639,38 @@ # No, just leave it "Freeciv" wherever you find it. # (Also, note that the "c" in "Freeciv" is not capitalized.) #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "これはFreeciv %s， %sクライアントです。" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "これはFreeciv %s， %sクライアントです。" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "%s クライアント" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "新しいゲームを開始する" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "ゲームに参加する" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "公開サーバーに参加する" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "LANサーバーに参加する" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLクライアントにようこそ" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "" @@ -15936,83 +15917,83 @@ msgid "?unitflag:Hunter" msgstr "ヘリコプター" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv バージョン %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(ベータ版)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv バージョン %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv バージョン %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "ベータテストバージョン " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "ver" -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "1月" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "2月" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "3月" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "4月" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "5月" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "6月" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "7月" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "8月" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "9月" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "10月" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "11月" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "12月" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16021,7 +16002,7 @@ "*** これはベータ版です ***\n" "Freeciv %s は %s に %s で公開される予定です。" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16036,7 +16017,7 @@ # http://arch.freeciv.org/freeciv-data-200007/msg00008.html # からのスレッドを読んで下さい。 # ここでは私の趣味も含め、 motto らしくしてみました。(ama) -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "自由な Civilization を求めて" @@ -16951,70 +16932,70 @@ msgstr "徴税官1人あたり，1ターンに金2が国庫に追加されます。" # clefs -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "ヨーロッパ調" # clefs -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "古典調" # clefs -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "熱帯調" # clefs -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "アジア調" # clefs -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "バビロニア調" # clefs -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "ケルト調" # clefs -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "ルネサンス調" # clefs -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "インダストリアル" # clefs -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "現代風" # clefs -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "ポストモダン" @@ -18874,18 +18855,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "新兵" @@ -19648,14 +19629,14 @@ "すぐに投入すれば，たった1ターンで完成させることができます。" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "バーバリアンの指導者" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21652,9 +21633,9 @@ "territory." msgstr "探検家は勇敢な人物で，未知の領域の地図作成にとても役立ちます。" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -22077,8 +22058,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "徴税官は1人あたり毎ターン金3を生み出します。" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "電子時代風" @@ -22515,19 +22496,25 @@ "これはあなた自身です。このユニットを失うと，ゲームは負けになります。失くすな" "よ。" +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "・バーバリアンのみが生産できます。\n" + # ntaka, clefs # もっと良い訳があるなら指摘してね。待ってます。 # →「空中警戒管制機」だけど，AWACSはAWACSで良いかな (clefs) # 「早期警戒管制機」の方が通りは良いらしい # →AWACSを知らなくても「早期警戒管制機」なら読んでわかると思ったので # やっぱり「早期警戒管制機」にします。航空機なのは絵を見ればわかりますし。 -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "早期警戒管制機" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -31693,19 +31680,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -31759,11 +31746,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "modpackのインストールに成功しました" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "modpackのインストールに失敗しました: %s" @@ -31796,14 +31783,14 @@ msgstr "" # Daniel -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "ゲームを終了してよろしいですか？" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "別のファイルのダウンロードが既に始まっています" @@ -31811,58 +31798,58 @@ msgid "Failed to start downloader" msgstr "ダウンローダが起動できませんでした" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "ライセンス" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "modpackのインストール" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "modpackのURL" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "インストールするmodpackの選択" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Freeciv modpack インストーラー (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Freeciv modpack インストーラー (gtk3)" @@ -32167,24 +32154,24 @@ msgid "A poorly-named city" msgstr "いいかげんに名付けられた都市" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "%sの所属を %sへ変更します。" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%2$sに駐留する %1$s を%3$sから%4$sへ引き渡しました。" # yasu -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%sを%sから%sへ引き渡しました。" @@ -32193,181 +32180,181 @@ # XXX 見たことのないメッセージ # Belgae #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%sの %sは %sの %sへの移転により失われました。" # clefs -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%2$sの支配権を失うと共に%1$sを失いました。" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr " %sを %sに移しました。" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "既に%sと呼ばれる都市があります。都市は%sと改名されました。" -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "%s の市民は，あなたの先進的な科学技術に大変驚いています！" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "労働者たちが自発的に集まり，%sに%sを敷設しました。" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "労働者たちが自発的に集まり，%sで工事が行われました。" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "%sを作りました。" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "%sを解散した都市 %sから移動しました(%sには留まれないため)。" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "%sが解散したとき， %sは外に出ることができなかったため座礁しました。" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "%sが解散した時， %sは外に出ることができなかったため座礁しました。" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "%sを完全に破壊しました。" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s は %sによって破壊されました。" -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "%sを占領し，金 %dを略奪しました！" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s は %sを占領し，金 %dを略奪しました。" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "%sを占領しました。" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%sは %sを占領しました。" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "%sを解放しました。金 %dを略奪しました。" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%sは %sを解放し，金 %dを略奪しました。" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "%sを解放しました！" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%sは %sを解放しました。" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "都市と共に%s - %s間の交易路が失われました。" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "%sと %sとの間の交易路は断絶されました。" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "%sの都市%s - %s間の交易路が失われました。" # clefs -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "残念ですが， %sは%sからあなたの%sへの交易路を断絶させました。" # clefs #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "%sと%sの都市%sの交易路は利益が小さいため廃止されました。" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "作業リストから" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%sで%s%sを作り始めました。" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "(今は陸地で囲まれている)%2$sの %1$sを %3$dで売ります。" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "%sの都市圏が%sしました。" # "The size of the city map of %s is %s."の後者の%sに代入されます。 -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "拡大" # "The size of the city map of %s is %s."の後者の%sに代入されます。 -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "縮小" @@ -32677,20 +32664,21 @@ msgid "The %s have started building a spaceship!" msgstr "%sが宇宙船の建造を開始しました！" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%sではまだ%sを作ることができません。" +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "・新しい都市を建設することができます。最初の都市サイズは%dです。\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%sで%sが完成しました。" #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -32698,82 +32686,82 @@ "%sの生産には人口 %dを消費します。 %sは縮小してサイズ %dになりました。" # yasu, ama -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "%2$sの%1$sは維持費が不足したため売却されました！" # clefs -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "国庫金が足りません。%sは解散しました。" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "公害が %sへ広がりつつあります。" # clefs # 昔の「○○を愛する日」の方が良かったなあ -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "%sであなたの偉業を讃える祝祭が催されています。" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "%sで祝祭が中止されました。" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%sに疫病が蔓延しています！人口が減少しました！" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "%sで暴動が発生しています。" -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "%sで未だに暴動が続いています。" -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%sの秩序が回復しました。" # yasu, clefs -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" "民衆の不満は頂点に達し，%sは完全に崩壊しました。動乱が全土に広がっています。" # yasu, clefs -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%sはまだ%sを生産できません。唯一の都市を解散することはできません。" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%sは解散して%sになりました。" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "%sからの移民は，食料不足のため %sに移住できませんでした。" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32781,7 +32769,7 @@ msgstr "%sからの移民は，食料不足のため %s(%s)に移住できませんでした。" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32789,14 +32777,14 @@ msgstr "%s(%s)からの移民は，食料不足のため %sに移住できませんでした。" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "%sからの移民は，食料不足のため %sに移住できませんでした。" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32805,7 +32793,7 @@ "た。" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32813,71 +32801,71 @@ "%s(%s)からの移民は，都市拡大に必要な建造物がないため %sに移住できませんでし" "た。" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%sから全ての住民がいなくなりました。" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "%sからの移民は，より良い生活を求めて %sに移住しました。" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "%sからの移民は，より良い生活を求めて %s(%s)に移住しました。" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "%s(%s)からの移民は，より良い生活を求めて %sに移住しました。" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%sが%sに襲われました！" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "%s周辺で放射性降下物による汚染が確認されました。" #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%sによって%sの市民に犠牲者が出ました。" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%1$sによって%3$sの%2$sが瓦礫の山と化しました。" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "%sで貯蔵されていた食料が全て失われました。" #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "%2$sで生産中の%1$sが失われました。" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "%sの市民は，より良い生活のため %sへの移住を考えています。" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34905,37 +34893,37 @@ # clefs # 'incident' => '事変'で訳してみました -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "%sの%sを買収する試みは事変に発展しました。" # clefs -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%sは%sを買収しようとして事変を引き起こしました。" # clefs -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "%sから技術を盗む試みは事変に発展しました。" # clefs -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%sはあなたから技術を盗もうとして事変を引き起こしました。" # clefs -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "%sで叛乱を煽動する試みは事変に発展しました。" # clefs -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%sは%sで叛乱を煽動しようとして事変を引き起こしました。" @@ -35300,20 +35288,20 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "ターン・タイムアウトが0より小さいです。0に修正しています。" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "サーバーは開始地点の割り当てに失敗しました。" # clefs -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "広大な土地です - 少し時間がかかるかもしれません。" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 は大きな島のいくつかを配置できません。" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 は配置しなかった%liの島を残しました。" @@ -35502,13 +35490,13 @@ msgstr "労働者たちが自発的に集まり，都市で敷設工事が行われました。" # clefs -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "地形の変更に伴い %sを移動しました。" # clefs -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "地形の変更に伴い %sを解散しました。" @@ -36201,8 +36189,8 @@ "ジョンが古い場合に起きることがあります。また，壊れているセーブファイルを指定" "したのかもしれません。続ける場合は自己責任でお願いします。" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%sは %sレベルのAIプレイヤーとして加わりました（%s）。" @@ -39088,7 +39076,17 @@ msgstr "%sとの停戦は終了しました。これより%sとは交戦状態になります。" # clefs -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"%sと%sの停戦期間は終了しました。両国は戦争状態となりました。両方との同盟を破" +"棄します。" + +# clefs +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -39097,56 +39095,56 @@ "%sと%sの停戦期間は終了しました。両国は戦争状態となりました。両方との同盟を破" "棄します。" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "圧縮タイプ %dはサポートしていません。" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "%s という名前でのゲーム保存に失敗しました。" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "%s という名前でゲームを保存しました。" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "ゲームは既に始まっています。" # clefs -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "%sはゲーム開始と同時にcontrolコマンドレベルを失いました。以後は投票システムを" "使用してください。" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "ゲームを開始しています。" # clefs -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "不明な報告の要求です (タイプ %d)" # clefs -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "警告: 旧型のクライアント%sを拒否しました" # clefs # Belgae -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -39154,44 +39152,44 @@ "お使いのクライアントは古すぎます。このサーバーを使用するには，Freeciv 2.2以降" "のクライアントにアップグレードしてください。" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "編集する権限はありません。" # clefs -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%sはもう他の誰かが選択しています。" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%sは%sの統治者 %sです。" # clefs -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "'maxplayers'の値以下でなければなりません" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "現在の民族セットでは，プレイヤーが操作できる民族の数が少なすぎます" "('nationset'設定を確認して下さい)" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "" @@ -39199,12 +39197,12 @@ "る民族セット('nationset')を変更してください。" # clefs -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%sが%sを率います。" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -39212,35 +39210,35 @@ "このfreeciv-serverプログラムはプレイヤー認証に対応していますが，現在はその機" "能を使用していません。" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "メタサーバー <%s>に情報を送信しています" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "メタサーバーへの接続を明示的に要求しなければ起動しません。" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "ゲーム終了です！" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" "適切なマップを生成することができませんでした。別のマップシードを試してみてく" "ださい。" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "サーバーオプション通りのマップを生成することができませんでした。" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "サーバーオプション '%s' は'%s'から'%s'に変更されました。" -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "ポート番号%dで新しいクライアント接続を受け付けています。" @@ -41171,17 +41169,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%1$sは｢%3$s｣の研究を完了したことにより，｢%2$s｣を獲得しました。" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "科学ポイントの産出量が不足しています。先端技術 %dを失いました。" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "科学の生産高が不十分です。「%s」を失いました。" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -41190,7 +41188,7 @@ "我が国の政治体制「%s」に必要な科学技術が失われました。「%s」にするために市民" "が革命を起こしました。" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -41199,34 +41197,34 @@ "我が国が目指す政治体制「%s」に必要な科学技術が失われました。市民は次に目標と" "する政治体制として「%s」を選択しました。 " -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%sに %sを生産できません。必要な科学技術が失われました。" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "研究目標は「%s」です。" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "%2$sから「%1$s」を盗みます。" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%sはあなたから「%s」を盗みました！" # yasu, ama -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%1$sは %3$sから「%2$s」を盗みました。" # Belgae -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "なんてこった！科学技術「%s」が完全に失われてしまった！" @@ -42146,6 +42144,19 @@ msgid "error %d (compiled without strerror)" msgstr "エラー %d (strerror 無しでコンパイルされました)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), %s クライアント" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s) Qtクライアント" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "これはFreeciv %s， %sクライアントです。" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%sではまだ%sを作ることができません。" + #, fuzzy #~ msgid "LAN" #~ msgstr "LAN サーバーは見つかりません" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ko.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ko.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ko.po freeciv-2.5.8/translations/freeciv/ko.po --- freeciv-2.5.7/translations/freeciv/ko.po 2017-05-13 12:07:55.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ko.po 2017-08-12 11:54:40.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Sungdae\n" "Language-Team: Korean language team\n" @@ -326,12 +326,12 @@ "*%s (AI)* 우리는 %s 에게 사납게 공격당했고, 우리는 당신의 도움을 필요합니다! " "우리의 영광스러운 동맹을 지키고, 당신의 이름은 절대로 잊혀지지 않을 것입니다!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s (은)는 %s 의 건설을 %s 에서 중단했습니다." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s (은)는 %s 의 건설을 %s 에서 시작했습니다." @@ -369,7 +369,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -763,13 +763,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1859,10 +1859,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "국기" @@ -2578,7 +2578,7 @@ msgstr "어떤 민족으로 합니까?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "민족을 선택" @@ -3218,16 +3218,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "이름" @@ -3346,11 +3346,11 @@ msgstr "민족" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "형식" @@ -3525,9 +3525,9 @@ msgid "Seen (Invis)" msgstr "부대 선택" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "알려지지 않은" @@ -3649,7 +3649,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "%s에 버그리포트.\n" @@ -3673,7 +3673,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4052,12 +4052,12 @@ msgid "Load Lua Script" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "새로운 도시 건설" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4087,8 +4087,8 @@ msgid "Set local options" msgstr "로컬 옵션 설정" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "게임 설정" @@ -4495,8 +4495,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "시나리오 게임 시작(_S)" @@ -4885,7 +4885,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "이 명령은 오직 클라이언트에서만 됩니다" @@ -4896,7 +4896,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4904,371 +4904,364 @@ "%s client" msgstr "이 명령은 오직 클라이언트에서만 됩니다" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "이 명령은 오직 클라이언트에서만 됩니다" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "새로운 게임 시작(_N)" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "시나리오 게임 시작(_S)" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "저장된 게임을 로딩(_L)" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "네트웍 게임에 연결(_O)" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Gaming Zone으로 연결(_Z)" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "저장하기 위한 장소 선택" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "찾아보기(_B)" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "서버명" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "포트" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "버전" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "상태" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "참가자들" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "인간" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "비평" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "L_AN" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "메타서버(_M)" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "호스트:(_H)" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "포트:(_P)" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "로그인:(_L)" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "암호:(_W)" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "암호 확인:(_I)" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "호스트" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "연결(_O)" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "연결 이름: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "사용자명: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "호스트: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "사용자/접속 정보" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s 정보" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "민족을 선택" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "이 플레이어를 관찰하기" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "이 사용자 데려오기" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "연결 끊기" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "사용자 제거" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "%s의 우주선" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "준비 안 됐슴(_R)" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "준비 됐슴(_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "시작(_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "이 사용자 데려오기(_T)" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "민족 선택(_N)" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "이 사용자 데려오기(_T)" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "관찰자: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "관찰하기(_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "관찰을 취소하기(_O)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "무작위" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "관찰자" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "붙임" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "플레이어 수(AI 포함):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "AI 숙련 레벨:(_L)" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "사막" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "기타 게임 옵션...(_M)" -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "기록" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "비율" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "준비" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "지도자" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "팀" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "로드하기 위해 저장된 게임을 선택하세요" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "로드하기 위해 저장된 게임을 선택하세요:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "시나리오 선택" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "시나리오 선택:(_S)" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "파일이름 저장 :" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "게임 저장" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "저장된 게임들 :" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "파일이름 저장 :" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "시나리오 게임 시작(_S)" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "시나리오 게임 시작(_S)" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "게임 저장" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "저장된 게임들 :" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "저장된 게임들 :" @@ -5790,7 +5783,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "암호:(_W)" @@ -5830,7 +5823,7 @@ msgstr "홈 도시로 하기(_H)" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "로드 게임" @@ -6104,8 +6097,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6293,7 +6286,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "정말 끝내시겠습니까?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6309,7 +6302,7 @@ msgid "Yes" msgstr "예" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6396,13 +6389,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Freeciv에 오신걸 환영합니다" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "관찰을 취소하기(_O)" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "관찰하기(_O)" @@ -6436,7 +6429,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "종료" @@ -6599,9 +6592,9 @@ msgid "Game" msgstr "게임" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "옵션" @@ -6630,8 +6623,8 @@ msgid "Leave game" msgstr "게임 나가기" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6919,7 +6912,7 @@ msgstr "세율" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6972,7 +6965,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "새로고침" @@ -6982,142 +6975,136 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "이 명령은 오직 클라이언트에서만 됩니다" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "부대" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "이 명령은 오직 클라이언트에서만 됩니다" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "이 명령은 오직 클라이언트에서만 됩니다" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "새로운 게임 시작" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "시나리오 게임 시작(_S)" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "저장된 게임 불러오기" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "네트웍 게임에 연결(_O)" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "연결" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "로그인 :" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "암호 :" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "암호 확인:(_I)" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "메타서버(_M)" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "관찰자" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "찾아보기(_B)" -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "시나리오 게임 시작(_S)" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "지도자 :" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "절단" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "시작" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "이 사용자 데려오기(_T)" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "파일이름 저장 :" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "시나리오 게임 시작(_S)" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "시나리오 게임 시작(_S)" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "관찰자" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "준비 안 됐슴(_R)" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "팀의 목록:" @@ -7229,7 +7216,7 @@ msgid "Back" msgstr "뒤로" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "로드 게임" @@ -8348,44 +8335,38 @@ msgstr "새 작업 리스트 추가" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv 서버 :" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "이 명령은 오직 클라이언트에서만 됩니다" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "새로운 게임 시작" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "게임에 참가" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "공개서버에 참가" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "LAN서버에 참가" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL클라언트에 오신것을 환영 합니다" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "" @@ -15035,83 +15016,83 @@ msgid "?unitflag:Hunter" msgstr "헬리콥터" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv 버젼 %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(베타판)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv 서버 :" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv 버젼 %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "베타판 " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "버젼" -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "1월" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "2월" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "3월" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "4월" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "5월" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "6월" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "7월" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "8월" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "9월" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "10월" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "11월" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "12월" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15121,7 +15102,7 @@ "Freeciv %s은 %s에 %s 에서\n" "공개할 예정 입니다" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15131,7 +15112,7 @@ "Freeciv %s은 %s에 %s 에서\n" "공개할 예정 입니다" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "문명은 자유이기 때문입니다" @@ -16015,61 +15996,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "유럽 형" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "고전 형" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "열대 형" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "동아 형" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "중동 형" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "켈트 형" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "르네상스 형" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "공업 형" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "현대 형" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "미래 형" @@ -17755,18 +17736,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "풋내기" @@ -18427,14 +18408,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "야만인의 수령" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20302,9 +20283,9 @@ msgstr "" "탐험가는 알려지지 않는 지역을 발견하는데 아주 유용하고 용감한 사람입니다." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -20712,8 +20693,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "켈트 형" @@ -21117,13 +21098,18 @@ "이것은 당신입니다. 만약 당신이 이 부대를 잃으면, 당신은 게임에서 지게 됩니" "다. 그러니 하지 마십시오." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28435,19 +28421,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "알려지지 않은" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "설치되지 않음" @@ -28502,12 +28488,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Freeciv 수정꾸러미 설치하는 사람 (Qt)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s (은)는 성공적으로 수송되었습니다." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28541,14 +28527,14 @@ msgid "Automatically install modpack from a given URL" msgstr "주어진 URL로부터 수정꾸러미 목록 적재하기" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "정말 끝내시겠습니까?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "다른 내려받기가 이미 활성화" @@ -28556,60 +28542,60 @@ msgid "Failed to start downloader" msgstr "내려받는 사람을 시작하기에 실패함" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "설치됨" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 #, fuzzy msgid "?modpack:Type" msgstr "불법적인 수정꾸러미 종류" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "면허증" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "수정꾸머리 설치하기" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "수정꾸러미 URL" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "설치할 수정꾸러미를 선택하기" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Freeciv 수정꾸러미 설치하는 사람 (gtk)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Freeciv 수정꾸러미 설치하는 사람 (gtk)" @@ -28895,84 +28881,84 @@ msgid "A poorly-named city" msgstr "하나의 형편없이-이름 지어진 도시" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "%s 의 고향을 %s (으)로 바꿈." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%3$s 에서 %4$s (으)로 %2$s 안의 %1$s (은)는 옮겨짐." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%2$s 에서 %3$s (으)로 %1$s (은)는 옮겨짐." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s (은)는 %s %s (으)로 이동 안에 잃어버렸습니다." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s (은)는 %s 의 통제와 함께 잃어버렸습니다." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "하나의 교체 %s (은)는 %s 안에 지어졌습니다." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" "당신은 이미 %s (이)라는 이름의 하나의 도시를 가집니다. 그 도시는 %s (으)로 이" "름을 다시 지어졌습니다." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "%s 안의 그 사람들은 당신의 과학 기술의 통찰력에 의해 기절했습니다!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, fuzzy, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "노동자들은 자발적으로 모이고 %s 도로들을 개선합니다." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "노동자들은 자발적으로 모이고 %s 도로들을 개선합니다." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "노동자들은 자발적으로 모이고 %s 기초들을 개선합니다." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "당신은 %s (을)를 발견했습니다." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "이것은 %3$s 위에 계속 있을 수 없기 때문에 해산된 도시 %2$s 의 밖으로 %1$s " "(을)를 이동함." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -28980,7 +28966,7 @@ "%s (이)가 해산되었을 때 당신의 %s (은)는 나갈 수 없었고, 그러므로 이것은 잃어" "버렸습니다." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -28988,77 +28974,77 @@ "%s (이)가 해산되었을 때 당신의 %s (은)는 나갈 수 없었고, 그러므로 이것은 잃어" "버렸습니다." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "당신은 %s (을)를 완전히 파괴합니다." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s (은)는 %s 에 의해 파괴되었습니다." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "당신은 %s (을)를 정복합니다; 당신의 약탈들은 %d 금으로 축적합니다!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s (은)는 %s (을)를 정복했고 그 도시로부터 %d 금을 약탈했습니다." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "당신은 %s (을)를 정복합니다." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s (이)가 %s (을)를 정복했습니다." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "당신은 %s (을)를 해방시켰습니다! 약탈들은 %d 금으로 축적합니다." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s (은)는 %s (을)를 해방시키고 그 도시로부터 %d 금을 약탈했습니다." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "당신은 %s (을)를 해방시켰습니다!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s (은)는 %s (을)를 해방시켰습니다." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "%s (와)과 %s 사이의 무역 경로를 취소했습니다." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "%s (와)과 %s 사이의 무역 경로를 취소했습니다." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" @@ -29066,24 +29052,24 @@ "다." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "미안한, 그 %s (은)는 %s 에서 당신의 도시 %s 까지의 그 무역 경로를 취소했습니" "다." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " 작업목록으로부터" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s (은)는 %s%s (을)를 짓고 있습니다." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -29091,16 +29077,16 @@ "당신은 %3$d 금을 위해 %2$s 안의 %1$s (이제 육지에 둘러싸인) (을)를 매각합니" "다." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "%s 의 그 도시 지도의 그 크기는 %s 입니다." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "증가됨" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "감소됨" @@ -29387,77 +29373,78 @@ msgid "The %s have started building a spaceship!" msgstr "그 %s (은)는 하나의 우주선을 건설하기 시작했습니다!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "%s (은)는 아직 %s (을)를 지을 수 없습니다." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s (은)는 건물 %s (을)를 끝냈습니다." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, fuzzy, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" "%s (은)는 인구 %d (을)를 희생시킵니다. %s (은)는 크기 %d (으)로 줄어듭니다." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "%2$s 안의 %1$s (을)를 유지할 형편이 될 수 없어, 건물은 팔렸습니다!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "충분하지 않은 금. %s (은)는 해산되었습니다." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "%s 가까이 공해." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "%s 안에 당신의 명예 안의 기념 행사들." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "%s 안의 기념 행사들은 취소됨." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s (은)는 하나의 전염병에 의해 발생되었습니다! 인구 감소!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "%s 안의 시민의 무질서." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "시.민.의. 무.질.서.는 %s 안에 계.속.됩.니.다." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%s 안의 질서가 회복되었습니다." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "그 사람은 당신의 %s (을)를 타도했고, 당신의 국가는 혼란 안에 있습니다." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -29465,13 +29452,13 @@ "할 수 없습니다." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s (은)는 %s 안으로 해산되었습니다." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -29480,7 +29467,7 @@ "%s (으)로 갈 수 없습니다!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29490,7 +29477,7 @@ "식량이 충분하지 않기 때문입니다!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29500,7 +29487,7 @@ "식량이 충분하지 않기 때문입니다!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -29509,7 +29496,7 @@ "이 필요하기 때문입니다!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -29518,7 +29505,7 @@ "향상이 필요하기 때문입니다!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -29526,13 +29513,13 @@ "%s (%s) (으)로부터 이주민들은 %s (으)로 갈 수 없는데 이것은 자라는데 하나의 " "향상이 필요하기 때문입니다!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s (은)는 이것의 시민들에 의해 해산되었습니다." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" @@ -29540,7 +29527,7 @@ "다." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" @@ -29548,7 +29535,7 @@ "했습니다." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" @@ -29556,41 +29543,41 @@ "했습니다." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%s (은)는 %s 에 의해 타격을 받았습니다." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "%s 가까이 공해." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "기근은 %s 안의 인구 손실을 야기했습니다." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "그 %s (은)는 그 %s (을)를 %s 안에서 파괴했습니다." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "당신의 %s (은)는 그 %s (을)를 %s 안에서 파괴했습니다." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%1$s 의 생산은 %3$s 안에 %2$s (으)로 개선되었습니다." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" @@ -29598,7 +29585,7 @@ "생각하고 있습니다." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -31585,37 +31572,37 @@ msgid "Your %s was captured after completing the mission." msgstr "당신의 %s (은)는 그 임무를 완료한 후에 잡혔습니다." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "당신은 그 %s %s (을)를 매수하는 동안 하나의 사건을 야기했습니다." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s (은) 당신의 %s (을)를 매수하는 동안 하나의 사건을 야기했습니다." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "당신은 %s (으)로부터 기술을 훔치기를 시도하는 동안 하나의 사건을 야기했습니" "다." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s (은)는 당신으로부터 기술을 훔치기를 시도하는 동안 하나의 사건을 야기했습니" "다." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "당신은 %s 안에서 하나의 봉기를 선동하는 동안 하나의 사건을 야기했습니다." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -31992,19 +31979,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "그 차례 시간초과는 0보다 더 작아서, 0으로 고정하는 중." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "그 서버는 출발 자세들을 할당할 수 없었습니다." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "높은 대륙 - 이것은 하나의 약간의 초를 가질 수도 있습니다." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "발생기 3은 모든 큰 섬들을 두지 않았습니다." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "발생기 3은 순위에 들지 않은 %li 대륙을 남겼습니다." @@ -32187,12 +32174,12 @@ "노동자들은 자발적으로 모이고 더 좋은 기초들과 함께 모든 가능한 도시들을 개선" "합니다." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "바뀌는 지형 때문에 당신의 %s (은)는 움직임." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "바뀌는 지형 때문에 당신의 %s (은)는 해산됨." @@ -32865,8 +32852,8 @@ "함께 발생할 수 있거나, 이것은 하나의 병약한 저장된 놀이 파일을 나타낼 수 있습" "니다. 당신의 소유한 위험에서 진행합니다." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s (은)는 %s 수준 인공지능-통제되는 참가자 (%s) 로서 추가되었습니다." @@ -35673,7 +35660,16 @@ "%s (와)과의 그 정전은 더 이상 유효하지 않게 되었습니다. 당신은 이제 그 %s 와" "(과) 전쟁 중입니다." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"%s 와(과) %s 사이의 그 정전은 더 이상 유효하지 않게 되었습니다. 그들은 전쟁 " +"중입니다. 동시에 당신은 당신의 동맹국을 취소합니다." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -35682,51 +35678,51 @@ "%s 와(과) %s 사이의 그 정전은 더 이상 유효하지 않게 되었습니다. 그들은 전쟁 " "중입니다. 동시에 당신은 당신의 동맹국을 취소합니다." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "지원되지 않는 압축 종류 %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "놀이를 %s (으)로 저장하기를 실패했습니다" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "놀이가 %s (으)로 저장되었습니다" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "그 놀이는 이미 달리고 있습니다." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "%s (은)는 놀이 시작 위에서 cmdlevel 통제를 잃었습니다. 이제부터 투표를 사용합" "니다." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "놀이를 시작하는 중입니다." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "알려지지 않은 보고서 (종류 %d) 에 대해 요구합니다" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "경고: 늙은 고객 %s (을)를 거부하는 중입니다." -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -35734,53 +35730,53 @@ "당신의 고객은 너무 늙었습니다. 이 서버를 사용하기 위해서, 제발 당신의 고객을 " "하나의 Freeciv 2.2 또는 그 후로 개선하세요." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "당신은 편집하기를 허용되지 않습니다." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s 국가는 이 시나리오 안에서 이용할 수 있지 않습니다." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s 국가는 이미 사용되고 있습니다." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s (은)는 그 %s 의 통치자 %s 입니다." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" "놀이가 시작하기를 기다립니다: %d 이 %d 참가자들 중에서 시작하기를 준비합니다." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "" "그곳에는 경기하기 적합한 국가들이 충분하지 않기 때문에 인공지능채우기를 줄이" "는 중." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s (은)는 그 %s (을)를 통치합니다." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -35788,33 +35784,33 @@ "이 freeciv-server 프로그램은 참가자 인증 지원을 가집니다만, 이것은 현재 사용" "되지 않습니다." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "메타서버 <%s> (으)로 정보를 보내는 중입니다." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "명쾌하게 요구한 메타서버 접속 없이 시작하지 않습니다." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "그 놀이는 끝났습니다..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "적합한 지도를 만들기에 실패했고, 다른 지도종자로 재시도하는 중입니다" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "주어진 설정들로 적합한 지도를 만들 수 없습니다." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "저장놀이: '%s' (은)는 %s (으)로 맞추어졌습니다." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "이제 새로운 고객 접속들을 수락하는 중입니다." @@ -37667,17 +37663,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "불충분한 과학 생산량. 우리는 미래 기술을 잃었습니다. %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "불충분한 과학 생산량. 우리는 %s (을)를 잃었습니다." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -37686,7 +37682,7 @@ "우리의 정부 '%s' (을)를 위한 그 필요한 기술이 사라졌습니다. 그 시민들은 " "'%s' (을)를 향해 하나의 혁명을 시작했습니다." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -37695,32 +37691,32 @@ "우리의 정부 '%s' (을)를 위한 그 필요한 기술이 사라졌습니다. 그 시민들은 " "'%s' (을)를 새로운 목표 정부로서 선택했습니다." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s (은)는 %s (을)를 지을 수 없습니다. 그 필요한 기술이 사라졌습니다." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "기술 목표는 %s 입니다." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "당신은 %s (을)를 그 %s 로부터 훔칩니다." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "그 %s (은)는 당신으로부터 %s (을)를 빼앗았습니다!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "그 %s (은)는 %s (을)를 그 %s 로부터 빼앗겼습니다." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -38641,6 +38637,21 @@ msgid "error %d (compiled without strerror)" msgstr "에러 %d(sterror이 없는 컴파일)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "이 명령은 오직 클라이언트에서만 됩니다" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "이 명령은 오직 클라이언트에서만 됩니다" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv 서버 :" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s (은)는 아직 %s (을)를 지을 수 없습니다." + #~ msgid "" #~ "If you receive an invention via a treaty, this setting defines the chance " #~ "that the invention is lost during the transfer." Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/lt.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/lt.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/lt.po freeciv-2.5.8/translations/freeciv/lt.po --- freeciv-2.5.7/translations/freeciv/lt.po 2017-05-13 12:07:55.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/lt.po 2017-08-12 11:54:41.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2010-10-11 20:07+0100\n" "Last-Translator: Andrius Štikonas \n" "Language-Team: Lithuanian \n" @@ -383,12 +383,12 @@ "*%s (DI)*Mus negailestinagi užpuolė %s ir mums reikia Jūsų pagalbos! " "Gerbkite mūsų sąjungą ir Jūsų vardas nebus pamirštas!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s nutraukė %s statybą tarp %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s pradėjo statyti %s tarp %s." @@ -420,7 +420,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -815,13 +815,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1936,10 +1936,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Vėliava" @@ -2683,7 +2683,7 @@ msgstr "Kokia tauta Jūs būsite?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Pasirinkite tautą" @@ -3373,16 +3373,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Vardas" @@ -3504,11 +3504,11 @@ msgstr "Tautos" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipas" @@ -3683,9 +3683,9 @@ msgid "Seen (Invis)" msgstr "Pasirinkti dalinį(-ius)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Nežinoma" @@ -3807,7 +3807,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Pranešti apie klaidas į %s.\n" @@ -3831,7 +3831,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4206,12 +4206,12 @@ msgid "Load Lua Script" msgstr "_Įkelti dalinį" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Statyti naują miestą" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4243,8 +4243,8 @@ msgid "Set local options" msgstr "" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Žaidimo nustatymai" @@ -4642,8 +4642,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Žaisti _scenarijų" @@ -5028,7 +5028,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "" @@ -5039,7 +5039,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5047,374 +5047,367 @@ "%s client" msgstr "Ši komanda skirta tik klientui." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Ši komanda skirta tik klientui." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Pradėti _naują žaidimą" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Žaisti _scenarijų" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Į_kelti išsaugotą žaidimą" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Prisijungti prie tinklo žaidimo" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 #, fuzzy msgid "Connect to Gaming _Zone" msgstr "Prisijungti prie tinklo žaidimo" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Naršyti..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Slaptažodžiai nesutampa. Įvesk slaptažodį." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Serverio pavadinimas" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Prievadas" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versija" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Būsena" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Žaidėjai" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Žmogus" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Komentaras" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Vietinis tinklas" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Interneto _metaserveris" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Prievadas:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Slaptažodis" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_Patvirtinti slaptažodį" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "'_Prisijungti" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Ryšio pavadinimas: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Žaidėjo vardas: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Mazgas: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s informacija" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Pasirinkite tautą" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Stebėti šį žaidėją" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Pasiimti šitą žaidėją" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Nutraukti susijungimą" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Pašalinti žaidėją" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Duoti ambasadą" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Priimti į %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "_Nepasiruošęs" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Pasiruošęs" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Pradėti" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Pasiimti šitą žaidėją" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Išsirink _tautą" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Pasiimti šitą žaidėją" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Stebėtojas: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Stebėti" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "_Nebestebėti" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s DI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Atsitiktinė" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Stebėtojas" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Atsijungęs" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Žaidėjų skaičius (įskaitant DI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "_DI meistriškumo lygis:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Dykuma" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Daugiau žaidimo _nustatymų" -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Įrašas" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Reitingas" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Pasiruošęs" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:Vadas" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Komanda" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Pasirinkite išsaugotą žaidimą įkėlimui" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Pasirinkite išsaugotą žaidimą į_kėlimui:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Pasirinkite scenarijų" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Pasirinkite _scenarijų" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Pervadinti" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Išsaugoti žaidimą" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Išsaugoti žaidimai:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Žaisti _scenarijų" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Žaisti _scenarijų" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Išsaugoti žaidimą" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Išsaugoti žaidimai:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Išsaugoti žaidimai:" @@ -5951,7 +5944,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Slaptažodis" @@ -5991,7 +5984,7 @@ msgstr "Pakeistas %s gimtasis miestas į %s." #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "Į_kelti" @@ -6271,8 +6264,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6463,7 +6456,7 @@ msgstr[2] "Ar tikrai norite išeiti?" msgstr[3] "Ar tikrai norite išeiti?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6479,7 +6472,7 @@ msgid "Yes" msgstr "Taip" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6569,13 +6562,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Sveiki atvykę į Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_Nebestebėti" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Stebėti" @@ -6609,7 +6602,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Išeiti" @@ -6788,9 +6781,9 @@ msgid "Game" msgstr "Žaidimas" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Nustatymai" @@ -6819,8 +6812,8 @@ msgid "Leave game" msgstr "Palikti žaidimą" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7106,7 +7099,7 @@ msgstr "Mokesčių norma:" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7159,7 +7152,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Atnaujinti" @@ -7170,142 +7163,136 @@ msgstr "Patvirtinti vienąkart" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Ši komanda skirta tik klientui." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Dalinys: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Freeciv versija %s %s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Ši komanda skirta tik klientui." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Pradėti naują žaidimą" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Žaisti _scenarijų" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Įkelti išsaugotą žaidimą" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Prisijungti prie tinklo žaidimo" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Sujungti" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Prisijungimo vardas:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Slaptažodis:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_Patvirtinti slaptažodį" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Interneto _metaserveris" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Stebėtojas" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Naršyti..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Žaisti _scenarijų" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Vadas:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Atsijungti" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Pradėti" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Pasiimti šitą žaidėją" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Žaisti _scenarijų" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Žaisti _scenarijų" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Stebėtojas" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "_Nepasiruošęs" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", sunkumo lygis %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Priimti į %s" @@ -7416,7 +7403,7 @@ msgid "Back" msgstr "Atgal" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Įkelti žaidimą" @@ -8591,44 +8578,38 @@ msgstr "Pridėti darbų sąrašą" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versija %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Freeciv versija %s %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Pradėti naują žaidimą" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Prisijungti prie žaidimo" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Prisijungti prie viešo serverio" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Prisijungti prie LAN serverio" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Miestas: %s" @@ -15761,83 +15742,83 @@ msgid "?unitflag:Hunter" msgstr "Sraigtasparnis" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versija %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta versija)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versija %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "beta versija testavimui " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versija " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "sausį" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "vasarį" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "kovą" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "balandį" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "gegužę" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "birželį" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "liepą" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "rugpjūtį" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "rugsėjį" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "spalį" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "lapkritį" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "gruodį" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15847,7 +15828,7 @@ "Freeciv %s bus išleistas\n" "%s %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15857,7 +15838,7 @@ "Freeciv %s bus išleistas\n" "%s %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Kadangi civilizacija turi būti laisva!" @@ -16682,61 +16663,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Europinis" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klasikinis" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropinis" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Azijos" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babilono" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Keltiškas" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renesansas" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Pramoninis" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Modernus" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:Post Modernas" @@ -18505,18 +18486,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "žalias" @@ -19151,14 +19132,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarų vadas" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20927,9 +20908,9 @@ "territory." msgstr "Tyrinėtojai yra labai naudingi ištirti nežinomoms teritorijoms." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21294,8 +21275,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?citystyle:Keltiškas" @@ -21688,13 +21669,19 @@ "Čia esate Jūs. Jei prarasite šį dalinį, pralaimėsite žaidimą. Tai " "nepraraskite." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Tik barbarai gali tai pastatyti.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28621,20 +28608,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Nežinoma" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -28689,12 +28676,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Pasirinkite technologiją, kurią norite pavogti" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s sėkmingai transportuotas." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28726,14 +28713,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Ar tikrai norite išeiti?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -28742,60 +28729,60 @@ msgid "Failed to start downloader" msgstr "Klaida kuriant naują DI žaidėją: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Pasirinkite technologiją, kurią norite pavogti" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Pasirinkite technologiją, kurią norite pavogti" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Pasirinkite technologiją, kurią norite pavogti" @@ -29089,108 +29076,108 @@ msgid "A poorly-named city" msgstr "Blogai pavadintas miestas" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Pakeistas %s gimtasis miestas į %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Perkelti %s tarp %s iš %s į %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Perkelti %s iš %s į %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s iš miesto %s prarastas pervedant į %s miestą %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s prarastas kartu su %s kontrole." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Naujas %s bus statomas tarp %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Jūs jau turėjote miestą, pavadintą %s. Miestas buvo pervadintas į %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Žmonės mieste %s yra apstulbinti Jūsų technologinių laimėjimų!\n" " Darbininkai iš karto susirenka ir nutiesia mieste geležinkelį." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Jūs įkūrėte %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "%s išvestas iš panaikinto miesto %s norint išvengti neturėjimo kur eiti " "būsenos." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Kai %s buvo panaikintas, %s negalėjo pasitraukti ir todėl buvo prarastas." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Kai %s buvo panaikintas, %s negalėjo pasitraukti ir todėl buvo prarastas." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Jūs visiškai sunaikinote %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%2s sunaikino %1s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -29199,7 +29186,7 @@ msgstr[2] "Jūs užkariavote %s; Jūsų grobis yra %d aukso!" msgstr[3] "Jūs užkariavote %s; Jūsų grobis yra %d aukso!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -29208,17 +29195,17 @@ msgstr[2] "%s užkariavo %s ir prisigrobė %d aukso iš miesto." msgstr[3] "%s užkariavo %s ir prisigrobė %d aukso iš miesto." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Jūs užkariavote %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s užkariavo %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -29227,7 +29214,7 @@ msgstr[2] "Jūs išvadavote %s! Grobdamas surinkote %d aukso." msgstr[3] "Jūs išvadavote %s! Grobdamas surinkote %d aukso." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -29236,33 +29223,33 @@ msgstr[2] "%s išvadavo %s ir prisigrobė %d aukso iš miesto." msgstr[3] "%s išvadavo %s ir prisigrobė %d aukso iš miesto." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Jūs išlaisvinote %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s išlaisvino %s" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" @@ -29270,24 +29257,24 @@ "miestą %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" "Apgailestaujame, tačiau %s panaikino prekybos kelią iš miesto %s į Jūsų " "miestą %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " iš darbų sąrašo" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s stato %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -29296,17 +29283,17 @@ msgstr[2] "Jūs parduodate %s mieste %s (dabar neturi kur eiti) už %d aukso." msgstr[3] "Jūs parduodate %s mieste %s (dabar neturi kur eiti) už %d aukso." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "Pakeistas %s gimtasis miestas į %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Oro bazė" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -29589,20 +29576,21 @@ msgid "The %s have started building a spaceship!" msgstr "%s pradėjo statyti erdvėlaivį!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s dar negali statyti %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Gali statyti naujus miestus.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s baigė statyti %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -29611,77 +29599,77 @@ msgstr[2] "" msgstr[3] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Negalime išlaikyti %s mieste %s, pastatas parduotas!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Nepakanka aukso. Išmontuojamas %s" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Tarša prie %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Audringos šventės Jūsų garbei mieste %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Šventimas atšauktas %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Neramumai %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "NERAMUMAI TĘSIASI %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Tvarka atstatyta %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Jūsų %s buvo nuversta. Jūsų šalis sumaištyje." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s dar negali statyti %s, ir mes negalime panaikinti mūsų vienintelio miesto." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s išformuotas į %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29689,7 +29677,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29697,91 +29685,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s išformuotas į %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "Ant %s buvo numesta branduolinė bomba. Ją numetė %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Tarša prie %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Badas sukelia populiacijos praradimą %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s sunaikino %s, esantį %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Jūsų %s sunaikino %s, esantį %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%s gamyba yra patobulinta į %s gamybą mieste %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -31489,32 +31477,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Jūsų %s buvo pagauta pabaigusi savo misiją." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Jūs sukėlėte incidentą bandydamas papirkti %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s sukėlė incidentą bandydamas papirkti Jūsų %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Jūs sukėlėte incidentą bandydamas iš %s pavogti technologiją." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s sukėlė incidentą bandydamas iš Jūsų pavogti technologiją." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Jūs sukėlėte incidentą bandydamas sukelti sukilimą mieste %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s sukėlė incidentą bandydamas sukelti sukilimą mieste %s." @@ -31837,19 +31825,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Laikas, skirtas ėjimui, mažesnis nei nulis. Grąžinama į nulį." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 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:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "3 generatorius nepaskirstė didelių salų." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "3 generatorius paliko %li sausumos nepaskirstęs." @@ -32030,12 +32018,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Jūsų %s patrauktas dėl besikeičiančio reljefo." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Jūsų %s panaikintas dėl besikeičiančio reljefo." @@ -32724,8 +32712,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s buvo įtrauktas kaip DI kontroliuojamas žaidėjas." @@ -35113,7 +35101,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Paliaubų laikas su %s baigėsi. Jūs dabar kariaujate su %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"%s ir %s susitiko ir vienas kitam paskelbė karą. Jūs nutraukiate sąjungą su " +"abiem." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -35122,49 +35119,49 @@ "%s ir %s susitiko ir vienas kitam paskelbė karą. Jūs nutraukiate sąjungą su " "abiem." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Nepavyko išsaugoti žaidimo kaip %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Žaidimas išsaugotas kaip %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Žaidimas jau paleistas." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Paleidžiamas žaidimas." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Dėmesio: atmetamas senas klientas %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -35172,83 +35169,83 @@ "Jūsų klientas yra per senas. Kad galėtumėte prisijungti prie šio serverio, " "prašome atsinaujinti savo klientą į Freeciv 2.2 arba naujesnį." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Jums neleidžiama nustatyti šios parinkties." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s tauta yra negalima šiam scenarijuje." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s tauta jau pasirinkta." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s yra %s valdovas %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s valdo %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Informacija siunčiama į metaserverį [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Žaidimas baigtas..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Šioje vietovėje negalima įrengti %s dalinio." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Parinktis %s buvo nustatyta į \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Dabar priimami nauji klientų prisijungimai." @@ -37076,56 +37073,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Pakelia mokslo produkciją mieste 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Tyrimų tikslas yra %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Pavogei %s iš %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s iš tavęs pavogė %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s pavogė %s iš %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -38077,6 +38074,21 @@ msgstr "klaida %d (kompiliuotas be strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Ši komanda skirta tik klientui." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Ši komanda skirta tik klientui." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versija %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s dar negali statyti %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/nb.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/nb.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/nb.po freeciv-2.5.8/translations/freeciv/nb.po --- freeciv-2.5.7/translations/freeciv/nb.po 2017-05-13 12:07:56.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/nb.po 2017-08-12 11:54:42.000000000 +0000 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-12 07:21+0300\n" "Last-Translator: Per I. Mathisen \n" "Language-Team: Norwegian \n" @@ -348,12 +348,12 @@ "*%s (AI)* Vi har blitt brutalt angrepet av %s, og vi trenger din hjelp! " "Respekter vr allianse og ditt navn vil aldri bli glemt!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s har stoppet byggingen av %s i %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s har startet byggingen av %s i %s." @@ -387,7 +387,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -796,13 +796,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1951,10 +1951,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flagg" @@ -2700,7 +2700,7 @@ msgstr "Hvilken nasjon vil du vre?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 #, fuzzy msgid "Pick Nation" @@ -3372,16 +3372,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Navn" @@ -3505,11 +3505,11 @@ msgstr "Nasjoner" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Type" @@ -3684,9 +3684,9 @@ msgid "Seen (Invis)" msgstr "Velg enhet(er)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Ukjent" @@ -3809,7 +3809,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n" @@ -3833,7 +3833,7 @@ msgstr "Skift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4214,12 +4214,12 @@ msgid "Load Lua Script" msgstr "_Last inn enhet" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Bygg ny by" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4250,8 +4250,8 @@ msgid "Set local options" msgstr "Sett lokale tilpasninger" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 #, fuzzy msgid "Game Settings" @@ -4672,8 +4672,8 @@ msgid "Game/Scenario Properties" msgstr "Spill/Scenario Egenskaper" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Lagre Scenario" @@ -5065,7 +5065,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Denne kommandoen er kun for klienten." @@ -5076,7 +5076,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5084,390 +5084,383 @@ "%s client" msgstr "Denne kommandoen er kun for klienten." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Denne kommandoen er kun for klienten." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Start _Nytt Spill" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Start Spill _Scenario" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Last Lagret Spill" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "K_oble til Nettverksspill" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 #, fuzzy msgid "Connect to Gaming _Zone" msgstr "Koble til nettverksspill" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Velg plassering for lagre spillet" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Let etter fil..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Passordene stemmer ikke, skriv inn passord." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servernavn" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versjon" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Spillere" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Menneske" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Kommentar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lok_alt Nettverk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internett _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Tjener" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Portnummer" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Navn:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Pass_ord:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_Gjenta passord:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Server" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 #, fuzzy msgid "C_onnect" msgstr "Koble til" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, fuzzy, c-format msgid "Connection name: %s" msgstr "Tilkobling under opprettelse." -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, fuzzy, c-format msgid "Player name: %s" msgstr "Spiller navn: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, fuzzy, c-format msgid "Host: %s" msgstr "Tjener:" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Spiller/oppkobling info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, fuzzy, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 #, fuzzy msgid "Toggle player ready" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 #, fuzzy msgid "Pick nation" msgstr "Velg nasjon" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observer denne spilleren" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 #, fuzzy msgid "Take this player" msgstr "Ta denne spilleren" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 #, fuzzy msgid "Cut connection" msgstr "Avbryter forbindelsen" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 #, fuzzy msgid "Aitoggle player" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 #, fuzzy msgid "Remove player" msgstr "Fjernet spiller %s." #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Gi info tilgang" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, fuzzy, c-format msgid "Put on %s" msgstr "Satt p: %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "_Ikke klar" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 #, fuzzy msgid "_Ready" msgstr "_Klargjr alle" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "_Ta spiller" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 #, fuzzy msgid "Pick _Nation" msgstr "Velg _Nasjon" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "_Ta spiller" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Observatr: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 #, fuzzy msgid "_Observe" msgstr "_Observatr" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "Ikke _observer n" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "<%s AI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 #, fuzzy msgid "Random" msgstr "Tilfeldig" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 #, fuzzy msgid "Observer" msgstr "Observatr" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 #, fuzzy msgid "Detached" msgstr "Frakoblet" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Antall spillere (inkludert datastyrte spillere):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Datastyrte spilleres _vanskelighetsgrad:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "rken" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Flere valg..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 #, fuzzy msgid "Record" msgstr "Handelsrapport" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 #, fuzzy msgid "Rating" msgstr "Skrivekunst" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 #, fuzzy msgid "Ready" msgstr "Klargjr alle" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?player:Leder" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Lag" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Velg lagret spill laste" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Velg lagret sill _laste:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Velg et scenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Velg et scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Lagre _filnavn:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Lagre spill" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Lagrede spill:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Lagre _filnavn:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Lagre Scenario" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Lagre Scenario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Lagre spill" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Lagrede spill:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Lagrede spill:" @@ -6013,7 +6006,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Pass_ord:" @@ -6054,7 +6047,7 @@ msgstr "Lag ny hjemby" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Fortsett lagret spill" @@ -6331,8 +6324,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6521,7 +6514,7 @@ msgstr[0] "Er du sikker p at du vil avslutte?" msgstr[1] "Er du sikker p at du vil avslutte?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6537,7 +6530,7 @@ msgid "Yes" msgstr "Ja" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6625,13 +6618,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Velkommen til Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Ikke _observer n" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Observatr" @@ -6665,7 +6658,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Avslutt" @@ -6835,9 +6828,9 @@ msgid "Game" msgstr "Spill" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Alternativer" @@ -6867,8 +6860,8 @@ msgid "Leave game" msgstr "Lagre spill" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7158,7 +7151,7 @@ msgstr "Skatteniv..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7211,7 +7204,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Oppfrisk" @@ -7222,144 +7215,138 @@ msgstr "Benytt en gang" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Denne kommandoen er kun for klienten." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Enhet %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Denne kommandoen er kun for klienten." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Denne kommandoen er kun for klienten." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Start nytt spill" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Start Spill _Scenario" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Fortsette et spill" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "K_oble til Nettverksspill" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Koble til" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Navn:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Passord:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_Gjenta passord:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internett _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Global Observatr" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Let etter fil..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Lagre Scenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Leder:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Koble fra" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 #, fuzzy msgid "Start" msgstr "_Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Lagre spillere" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Lagre _filnavn:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Scenario navn" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Scenario navn" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Global Observatr" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "_Ikke klar" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", vanskelighetsgrad %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Satt p: %s" @@ -7472,7 +7459,7 @@ msgid "Back" msgstr "Tilbake" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Fortsette et spill" @@ -8702,46 +8689,40 @@ msgstr "Legg til ny arbeidsliste" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versjon %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Denne kommandoen er kun for klienten." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Start nytt spill" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "Fortsette et spill" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 #, fuzzy msgid "Join LAN Server" msgstr "Koble til Lokalt Nettverk" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient; velkommen skal du vre..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "By: %s" @@ -15670,83 +15651,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versjon %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta-versjon)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versjon %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versjon %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "beta-test versjon " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versjon " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "januar" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "februar" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "mars" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "april" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "mai" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "august" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "september" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "november" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "desember" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15756,7 +15737,7 @@ "Freeciv %s vil snart bli utgitt i\n" "%s, p %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15766,7 +15747,7 @@ "Freeciv %s vil snart bli utgitt i\n" "%s, p %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Fordi Civilization burde vre fritt!" @@ -16661,69 +16642,69 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 #, fuzzy msgid "?citystyle:European" msgstr "Eurpeisk" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 #, fuzzy msgid "?citystyle:Classical" msgstr "Klassisk" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropisk" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 #, fuzzy msgid "?citystyle:Asian" msgstr "?city:Fiendtlig" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 #, fuzzy msgid "?citystyle:Babylonian" msgstr "Babylonisk" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 #, fuzzy msgid "?citystyle:Celtic" msgstr "Keltisk" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 #, fuzzy msgid "?citystyle:Renaissance" msgstr "Renessanse" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 #, fuzzy msgid "?citystyle:Industrial" msgstr "Industrial" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 #, fuzzy msgid "?citystyle:Modern" msgstr "Moderne" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 #, fuzzy msgid "?citystyle:PostModern" msgstr "PostModerne" @@ -18506,18 +18487,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "Helt fersk" @@ -19176,14 +19157,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarleder" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21083,9 +21064,9 @@ "territory." msgstr "Utforskere er nyttig til kartlegge ukjent territorie." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21495,8 +21476,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "Elektron" @@ -21915,13 +21896,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Kun fallskjermjegere kan gjre dette." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29584,20 +29571,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Ukjent" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29652,12 +29639,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Velg fremskritt som skal stjeles" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s ble transportert trygt fram." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29689,14 +29676,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Er du sikker p at du vil avslutte?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29705,60 +29692,60 @@ msgid "Failed to start downloader" msgstr "Feil ved opprettelse av ny AI spiller: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Velg fremskritt som skal stjeles" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Velg fremskritt som skal stjeles" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Velg fremskritt som skal stjeles" @@ -30041,208 +30028,208 @@ msgid "A poorly-named city" msgstr "En by med drlig navn" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Endret hjemby for %s til %s" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Overfrte %s i %s fra %s til %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Overfrte %s fra %s til %s." # problem #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s gikk tapt i et angrep fra %s %s." # problem -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Vi mistet %s da vi mistet kontroll over %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Et nytt %s er bygd i %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Du har allerede en by som heter %s. Byen ble omdpt til %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Folket i %s lar seg forblffe over din enorme teknologiske innsikt!\n" " Arbeiderne samler seg til dugnad og oppgraderer byen med jernbaner." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, fuzzy, c-format msgid "You have founded %s." msgstr "Du har grunnlagt %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Flyttet %s ut av forlatt by %s for unng bli lst fast." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, fuzzy, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Da %s ble opplst klarte ikke %s flykte og gikk derfor tapt." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "Da %s ble opplst klarte ikke %s flykte og gikk derfor tapt." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Du delegger %s fullstendig." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s har blitt delagt av %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, fuzzy, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Du erobrer %s og plyndringene summerer seg til %d gull!" msgstr[1] "Du erobrer %s og plyndringene summerer seg til %d gull!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, fuzzy, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s har erobret %s og plyndret %d gull fra byen." msgstr[1] "%s har erobret %s og plyndret %d gull fra byen." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Du beseiret %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, fuzzy, c-format msgid "%s conquered %s." msgstr "%s beseieret %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, fuzzy, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Du har frigjort %s! Plyndringene summerer seg til %d gull." msgstr[1] "Du har frigjort %s! Plyndringene summerer seg til %d gull." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, fuzzy, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s har frigjort %s og plyndret %d gull fra byen." msgstr[1] "%s har frigjort %s og plyndret %d gull fra byen." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, fuzzy, c-format msgid "You have liberated %s!" msgstr "Du har frigjort %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, fuzzy, c-format msgid "%s liberated %s." msgstr "%s frigjorde %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "beklager, %s har avbrutt handelsruten fra %s til din by %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "beklager, %s har avbrutt handelsruten fra %s til din by %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " fra arbeidslisten" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s bygger n %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Du selger %s i %s (n uten havn) for %d gull." msgstr[1] "Du selger %s i %s (n uten havn) for %d gull." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "Endret hjemby for %s til %s" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Flystripe" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30509,90 +30496,91 @@ msgid "The %s have started building a spaceship!" msgstr "%s har startet byggingen av et romskip!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s kan ikke bygge %s enn." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Kan bygge nye byer.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s har fullfrt byggingen av %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Har ikke rd til opprettholde %s i %s, bygningen er blitt solgt!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Ikke nok gull. %s opplst" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Forurensning nr %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Innbyggerne i %s arrangerer en festival til din re." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Feiringen i %s avsluttet." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s har blitt rammet av pest! Befolkning redusert!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Uroligheter i %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "UROLIGHETENE FORTSETTER i %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Lov og orden er gjeninnfrt i %s." # litt usikker p denne -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Folket har kastet %s. Hele landet er i opprr." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s kan ikke bygge %s enn, og vi kan ikke forlate vr eneste by." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s er opplst i %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -30600,7 +30588,7 @@ "Emigranter fra %s can ikke g til %s fordi det ikke er nok mat tilgjengelig!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30610,7 +30598,7 @@ "tilgjengelig!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30620,7 +30608,7 @@ "tilgjengelig!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -30629,7 +30617,7 @@ "vokse!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -30638,7 +30626,7 @@ "for vokse!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -30646,71 +30634,71 @@ "Emigranter fra %s (%s) kan ikke g til %s fordi de trenger en oppgradering " "for vokse!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s er opplst i %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Migranter fra %s flyttet til %s i sken etter et bedre liv." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Migranter fra %s flyttet til %s (%s) i sken etter et bedre liv." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Migranter fra %s (%s) flyttet til %s i sken etter et bedre liv." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s ble utsatt for atomangrep fra %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Forurensning nr %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Hungersnd frer til befolkningstap i %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s dela %s i %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Din %s dela %s i %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Produksjon av %s er oppgradert til %s i %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "Innbyggerne i %s vurderer migrere til %s for et bedre liv." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32592,34 +32580,34 @@ msgid "Your %s was captured after completing the mission." msgstr "Din %s ble fanget etter ha fullfrt sitt oppdrag." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Du har forrsaket en skandale ved bestikke %ss %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s har forrsaket en skandale ved bestikke din %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, fuzzy, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Du har skapt en skandale ved teknologityveriet fra %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, fuzzy, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s har forrsaket en skandale ved stjele teknologi fra deg." # problem -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Du har forrsaket en skandale ved oppmuntre til opprr i %s." # problem -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s har forrsaket en skandale ved oppmuntre til opprr i %s." @@ -32966,19 +32954,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Rundens tidsfrist er mindre enn null, setter den til null." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Mye landmasse - dette kan ta noen sekunder." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 plasserte ikke alle de store yene." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 forlot %li landmasse uplassert." @@ -33164,12 +33152,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, fuzzy, c-format msgid "Moved your %s due to changing terrain." msgstr "Flyttet din %s p grunn av transformasjon fra sj til land." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, fuzzy, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Opplste din %s p grunn av transformasjon fra land til sj." @@ -33871,8 +33859,8 @@ "lagrede spill, eller det kan tyde p feil ved selve filen. Fortsett p eget " "ansvar." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s ble lagt til som en AI-styrt spiller med niv %s." @@ -36532,7 +36520,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Vpenhvilen med %s har utlpt. Du er n nytral til %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Spilleren %s som du er p lag med har erklrt krig mot %s. Du m avbryte " +"alliansen med %s." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36541,49 +36538,49 @@ "Spilleren %s som du er p lag med har erklrt krig mot %s. Du m avbryte " "alliansen med %s." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "stttede alternativ: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Klarte ikke lagre spill som %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Spill lagret som %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Spillet er allerede i gang." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Starter spillet." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "foresprsel etter ukjent rapport (type: %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Advarsel: forkastet gammel klient %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 #, fuzzy msgid "" "Your client is too old. To use this server, please upgrade your client to a " @@ -36592,84 +36589,84 @@ "Din klient er for gammel. For bruke denne serveren m du oppdatere din " "klient til en CVS versjon etter 2003-11-28 eller Freeciv 2.2 eller senere." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Du har ikke lov sette dette alternativet." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Forklaringer er tilgjengelige for flgende serveralternativ:" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, fuzzy, c-format msgid "%s nation is already in use." msgstr "Den nasjonen er allerede i bruk." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s er den %se herskeren %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s styrer %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Sender info til metaserver [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Spillet er over..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "" "Kan ikke lage en enhet p %s fordi den angitte enhets type id %d er ugyldig." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Alternativ: %s har blitt satt til \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Aksepterer n nye klientforbindelser." @@ -38532,56 +38529,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "ker byen forskningsbidrag med 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Teknologimlet er %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Du stjeler %s fra %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s stjal %s fra deg!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Din %s stjal %s fra %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39490,6 +39487,21 @@ msgid "error %d (compiled without strerror)" msgstr "feil %d (kompilert uten 'strerror')" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Denne kommandoen er kun for klienten." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Denne kommandoen er kun for klienten." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versjon %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s kan ikke bygge %s enn." + # problem #, fuzzy #~ msgid "" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/nl.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/nl.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/nl.po freeciv-2.5.8/translations/freeciv/nl.po --- freeciv-2.5.7/translations/freeciv/nl.po 2017-05-13 12:07:56.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/nl.po 2017-08-12 11:54:41.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Jos Maalderink \n" "Language-Team: Nederlands \n" @@ -344,12 +344,12 @@ "*%s (KI)* We zijn bruut aangevallen door %s en hebben uw hulp nodig! Houd " "ons verbond in ere en uw naam zal nooit vergeten worden!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "De %s zijn gestopt met het bouwen van %s in %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "De %s zijn begonnen met het bouwen van %s in %s." @@ -387,7 +387,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -786,13 +786,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1905,10 +1905,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Vlag" @@ -2632,7 +2632,7 @@ msgstr "Welke Natie Wil Je Zijn?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Kies Natie" @@ -3292,16 +3292,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Naam" @@ -3411,11 +3411,11 @@ msgstr "Naties" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Type" @@ -3588,9 +3588,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Onbekend" @@ -3712,7 +3712,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Meld fouten op %s\n" @@ -3736,7 +3736,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Beeld" @@ -4108,12 +4108,12 @@ msgid "Load Lua Script" msgstr "Lua-script laden" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Nieuwe Stad Stichten" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4143,8 +4143,8 @@ msgid "Set local options" msgstr "Lokale opties instellen" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Spelinstellingen" @@ -4520,8 +4520,8 @@ msgid "Game/Scenario Properties" msgstr "Spel-/Scenario-eigenschappen" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Scenario Opslaan" @@ -4882,7 +4882,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Dit is %s, client is %s." @@ -4893,7 +4893,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4901,364 +4901,357 @@ "%s client" msgstr "Dit is %s, client is %s." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Dit is %s, client is %s." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Nieuw Spel Beginnen" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "_Scenario Beginnen" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Bewaard Spel Laden" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Verbinden met Netwerkspel" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Verbinden met Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Kies Opslaglocatie" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Bladeren..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Wachtwoorden komen niet overeen, voer wachtwoord in." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servernaam" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Poort" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versie" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Spelers" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Menselijke Spelers" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Commentaar" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lok_aal Netwerk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Poort:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Wacht_woord:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Bevest_ig Wachtwoord:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Verbinden" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Verbindingsnaam: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Spelersnaam :%s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Speler-/verbindinginfo" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%sinfo" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Speler wel/niet klaar schakelen" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Natie Kiezen" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Deze speler waarnemen" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Deze speler nemen" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Verbinding verbreken" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "KI voor speler schakelen" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Speler verwijderen" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "%s toegang geven" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "In %s zetten" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Niet klaa_r" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "Klaa_r " -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Starten" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "%s Nemen" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "_Natie Kiezen" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "_Speler Nemen" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "%s Waarnemen" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Waarnemen" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "_Niet Waarnemen" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Willekeurig" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Waarnemer" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Losgekoppeld" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Aantal S_pelers (KI inbegrepen):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Sterkte KI" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Resetten" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Meer Spelopties..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Opnemen" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rating" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Klaar" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Leider" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Team" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Opgeslagen Spel om te Laden Kiezen" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Kies Opgeslagen Spel om te _Laden:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Een Scenario Kiezen" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Kies een _Scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Bestandsnaam:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Spel Opslaan" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Op_geslagen Spellen:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Spel Opslaan in Bestand:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Opgeslagen _Scenario's" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "_Scenario Opslaan" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Kaartafbeelding Opslaan" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Opgeslagen Kaartafbeeldingen:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Kaartafbeelding Opslaan:" @@ -5776,7 +5769,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Meer informatie is beschikbaar door links te klikken op de burgers." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Wacht_woord:" @@ -5817,7 +5810,7 @@ msgstr "Verhuis naar deze stad" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Inladen" @@ -6097,8 +6090,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6288,7 +6281,7 @@ msgstr[0] "Weet je zeker dat je het spel wil verlaten?" msgstr[1] "Weet je zeker dat je het spel wil verlaten?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6304,7 +6297,7 @@ msgid "Yes" msgstr "Ja" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6392,13 +6385,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Dit is Qt-client voor Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_Niet Waarnemen" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Waarnemen" @@ -6436,7 +6429,7 @@ "na '--'. Zie de Gtk-documentatie.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Stoppen" @@ -6605,9 +6598,9 @@ msgid "Game" msgstr "Spel" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opties" @@ -6636,8 +6629,8 @@ msgid "Leave game" msgstr "Spel Verlaten" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6914,7 +6907,7 @@ msgstr "Belastingtarieven..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6966,7 +6959,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Ververs" @@ -6977,143 +6970,137 @@ msgstr "Eenmaal toepassen" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Dit is %s, client is %s." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Eenheid: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Dit is %s, client is %s." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Dit is %s, client is %s." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Nieuw Spel Beginnen" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "_Scenario Beginnen" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Laad Bewaard Spel" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Verbinden met Netwerkspel" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Verbinding maken" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_Login:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Wachtwoord:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Bevest_ig Wachtwoord:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "(Algemene Waarnemer)" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Bladeren..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Scenario Opslaan" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "_Leider:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Verbinding Verbreken" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Beginnen" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Spelers Opslaan" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Spel Opslaan in Bestand:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Naam Scenario" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Naam Scenario" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "(Algemene Waarnemer)" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Niet klaa_r" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", moeilijkheidsniveau %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "In %s zetten" @@ -7225,7 +7212,7 @@ msgid "Back" msgstr "Terug" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Spel Laden" @@ -8358,44 +8345,38 @@ msgstr "Nieuwe werklijst toevoegen" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freecivversie %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Dit is %s, client is %s." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Nieuw Spel Beginnen" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Aan Spel Deelnemen" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Aan Pubserver Deelnemen" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Verbinden met LAN-server" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient heet je welkom..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Stad: %s" @@ -15413,83 +15394,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freecivversie %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(bètaversie)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freecivversie %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freecivversie %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "bètatestversie " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versie " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "januari" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "februari" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "maart" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "april" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "mei" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "augustus" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "september" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "november" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "december" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15498,7 +15479,7 @@ "DIT IS EEN BÈTAVERSIE\n" "Freeciv %s wordt vrijgegeven in %s, op %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15507,7 +15488,7 @@ "DIT IS EEN BÈTAVERSIE\n" "Freeciv %s wordt vrijgegeven in op %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Omdat beschaving vrij zou moeten zijn!" @@ -16412,61 +16393,61 @@ msgstr "" "Elke belastingontvanger voegt per beurt twee extra goud aan je schatkist.toe." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Europees" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Klassiek" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropisch" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Aziatisch" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babylonisch" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Keltisch" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renaissancistisch" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industrieel" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Postmodern" @@ -18262,18 +18243,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "groentjes" @@ -19034,14 +19015,14 @@ "gehele bouwwerk in een enkele beurt te voltooien!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarenleider" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21016,9 +20997,9 @@ "Verkenners zijn dappere lieden die bruikbaar zijn voor het in kaart brengen " "van onbekend gebied." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21436,8 +21417,8 @@ "Elke belastingontvanger produceert per beurt drie extra goud voor je " "schatkist." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "ElektrischeTijd" @@ -21871,13 +21852,19 @@ "Dit ben jij. Als deze eenheid verloren gaat, verlies je het spel. Laat dit " "dus niet gebeuren." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Alleen barbaren kunnen dit bouwen.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29779,20 +29766,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Onbekend" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29847,12 +29834,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Kies Vooruitgang om te Stelen" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s succesvol overgeplaatst." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29885,14 +29872,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Weet je zeker dat je het spel wil verlaten?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29901,50 +29888,50 @@ msgid "Failed to start downloader" msgstr "Fout bij maken nieuwe KI-speler: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 #, fuzzy msgid "Installed" msgstr "Vrouwelijk" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 #, fuzzy msgid "License" msgstr "Lankese" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Kies Vooruitgang om te Stelen" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 #, fuzzy msgid "" "This modpack installer accepts the standard Gtk command-line options\n" @@ -29955,12 +29942,12 @@ "na '--'. Zie de Gtk-documentatie.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Kies Vooruitgang om te Stelen" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Kies Vooruitgang om te Stelen" @@ -30246,50 +30233,50 @@ msgid "A poorly-named city" msgstr "Een slecht benoemde stad" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Hoofdstad verplaatst van %s naar %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s in %s overgeplaatst van %s naar %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s overgeplaatst van %s naar %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s verloren bij een verhuis naar %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s verloren samen met besturing van %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Een nieuw %s is gebouwd in %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "U had al een stad genaamd %s. De stad is hernoemd naar %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -30297,32 +30284,32 @@ " Arbeiders verzamelen zich spontaan om de stad op te waarderen met " "spoorwegen." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "U heeft %s gesticht." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "%s uit verlaten stad %s gehaald om vastzitten te voorkomen." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -30330,7 +30317,7 @@ "Toen %s werd verlaten konden uw %s niet wegkomen en zijn daardoor teloor " "gegaan." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -30338,119 +30325,119 @@ "Toen %s werd verlaten konden uw %s niet wegkomen en zijn daardoor teloor " "gegaan." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "U vernietigt %s volledig." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s is vernietigd door %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "U verovert %s, uw plunderingen leveren %d goud op!" msgstr[1] "U verovert %s, uw plunderingen leveren %d goud op!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s veroverde %s en plunderde %d goud uit de stad." msgstr[1] "%s veroverde %s en plunderde %d goud uit de stad." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "U verovert %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s veroverden %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "U hebt %s bevrijd!! plunderingen leveren %d goud op." msgstr[1] "U hebt %s bevrijd!! Plunderingen leveren %d goud op." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s bevrijdde %s en plunderde %d goud uit de stad." msgstr[1] "%s bevrijdde %s en plunderde %d goud uit de stad." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "U heeft %s bevrijd!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s heeft %s bevrijd.." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Sorry, %s heeft de handelsroute tussen %s en uw stad %s gestaakt." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Sorry, %s heeft de handelsroute tussen %s en uw stad %s gestaakt." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " van de werklijst" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s is %s%s aan het bouwen." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "U verkoopt %s in %s (nu ingesloten door land) voor %d goud." msgstr[1] "U verkoopt %s in %s (nu ingesloten door land) voor %d goud." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "De %s van de %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Luchthaven" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30723,96 +30710,97 @@ msgid "The %s have started building a spaceship!" msgstr "De %s zijn begonnen met het bouwen van een ruimteschip!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s kan %s nog niet bouwen." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Kan nieuwe steden bouwen.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s is klaar met het bouwen van %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Onderhoud van %s in %s niet meer op te brengen, gebouw verkocht!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Niet genoeg goud. %s ontbonden." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Verontreiniging bij %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Er zijn wilde feesten aan de gang ter uwer ere in %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Festival afgezegd in %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Burgelijke onlusten in %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "BURGELIJKE ONLUSTEN GAAN DOOR in %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Orde hersteld in %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "De bevolking heeft uw %s omvergeworpen, uw land is in verwarring." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s kan nog geen %s bouwen en we kunnen onze enige stad niet ontbinden." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s is ontbonden in %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30820,7 +30808,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30828,91 +30816,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s is ontbonden in %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s is geatomiseerd door %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Verontreiniging bij %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Hongersnood veroorzaakt sterfte in %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "De %s vernietigden de %s in %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Uw %s vernietigde de %s in %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Productie van %s is opgewaardeerd naar %s in %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32788,37 +32776,37 @@ msgid "Your %s was captured after completing the mission." msgstr "Uw %s is gevangengenomen na afronding van haar missie." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "U hebt een schandaal veroorzaakt met het omkopen van %s's %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s heeft een schandaal veroorzaakt met het omkopen van uw %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "U hebt een schandaal veroorzaakt in uw poging technologie van %s te stelen." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s heeft een schandaal veroorzaakt bij een poging tot stelen van uw " "technologie." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" "U hebt een schandaal veroorzaakt met uw poging een opstand te ontketenen in " "%s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -33141,19 +33129,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "De tijdslimiet van de beurt is kleiner dan nul, ingesteld op nul." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Grote landmassa - dit kan een paar seconden duren." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 kon niet alle grote eilanden plaatsen." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 liet %li landmassa ongeplaatst." @@ -33341,12 +33329,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Verplaatste uw %s vanwege de terreinsverandering." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Ontbond uw %s vanwege de terreinsverandering." @@ -34049,8 +34037,8 @@ "oudere opgeslagen spelen of het kan een beschadigd spelbestand betekenen. Ga " "verder op eigen risico." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s is toegevoegd als een niveau %s KI-gestuurde speler." @@ -36744,7 +36732,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "De wapenstilstand met %s is afgelopen. U bent nu in oorlog met de %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het " +"afbreken van uw alliantie met %s." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36753,49 +36750,49 @@ "Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het " "afbreken van uw alliantie met %s." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "ondersteunde opties: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Kon spel niet als %s bewaren" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Spel bewaard als %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Het spel is al begonnen." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Spel begint." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "verzoek om onbekend rapport (type %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Waarschuwing: weiger oude client %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 #, fuzzy msgid "" "Your client is too old. To use this server, please upgrade your client to a " @@ -36804,83 +36801,83 @@ "Uw client is te oud. Waardeer uw client op tot CVS versie 2003-11-28 of " "later of Freeciv 2.2 of later om deze server te gebruiken." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "U mag deze optie niet instellen." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "%s natie niet beschikbaar in dit scenarie." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "De %s natie wordt al gespeeld." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s is de %s heerser %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s regeert de %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Zend info naar metaserver [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Het spel is voorbij..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "U kan op dit terrein geen %s eenheid maken." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Optie: %s is ingesteld op \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Accepteer nu nieuwe client-verbindingen." @@ -38732,56 +38729,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Verhoogt de wetenschapelijke opbrengsten van een stad met 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Technologisch doel is %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "U steelt %s van de %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "De %s stalen %s van u!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "De %s hebben %s gestolen van de %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39697,6 +39694,21 @@ msgid "error %d (compiled without strerror)" msgstr "fout %d (gecompileerd zonder strerror)" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Dit is %s, client is %s." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Dit is %s, client is %s." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freecivversie %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s kan %s nog niet bouwen." + #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/pl.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/pl.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/pl.po freeciv-2.5.8/translations/freeciv/pl.po --- freeciv-2.5.7/translations/freeciv/pl.po 2017-05-13 12:07:57.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/pl.po 2017-08-12 11:54:42.000000000 +0000 @@ -35,7 +35,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2015-05-20 15:46+0100\n" "Last-Translator: Hubert Kowalewski \n" "Language-Team: polski \n" @@ -383,12 +383,12 @@ "pomocy! Jeśli wspomożesz swoich sojuszników, twoje imię nie zostanie " "zapomniane!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s przerwali budowę cudu %s w mieście %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s rozpoczęli budowę %s w mieście %s." @@ -425,7 +425,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -830,13 +830,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1945,10 +1945,10 @@ msgstr "#" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flaga" @@ -2682,7 +2682,7 @@ msgstr "Jakim narodem będziesz?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Wybierz naród" @@ -3359,16 +3359,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nazwa" @@ -3478,11 +3478,11 @@ msgstr "Narody" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Typ" @@ -3653,9 +3653,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Nieznane" @@ -3777,7 +3777,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Zgłaszanie błędów na adres <%s>\n" @@ -3801,7 +3801,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "?noun:Widok" @@ -4173,12 +4173,12 @@ msgid "Load Lua Script" msgstr "Wczytaj skrypt Lua" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Budowa nowego miasta" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4208,8 +4208,8 @@ msgid "Set local options" msgstr "Lokalne opcje" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Opcje gry" @@ -4585,8 +4585,8 @@ msgid "Game/Scenario Properties" msgstr "Właściwości gry/scenariusza" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Zapisz scenariusz" @@ -4946,7 +4946,7 @@ # #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, klient %s." @@ -4958,7 +4958,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4969,269 +4969,261 @@ "łatka: %s\n" "klient %s" -# -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), klient %s." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Rozpocznij nową grę" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Rozpocznij nowy scenariusz" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Wczytaj zachowaną grę" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Przyłącz się do gry sieciowej" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Połącz się z Gaming Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Wybierz miejsce zapisu" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "Przeglądaj..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Nieprawidłowe hasło, wprowadź hasło." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nazwa serwera" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Wersja" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Gracze" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Ludzie" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Komentarz" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Sieć lokalna" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Metaserwer internetowy" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "Użytkownik:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Hasło:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Potwierdź hasło:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Połącz" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nazwa połączenia: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nazwa gracza: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Informacje o graczu/połączeniu." -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Statystyki %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Przełącz gotowych graczy" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Wybierz naród" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Obserwuj tego gracza" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Przejmij tego gracza" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Przerwij połączenie" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Przełącz AI gracza" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Usuń gracza" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Daj dostęp %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Umieść w %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Nie przygotowany" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "Gotowy" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "Wybierz %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Wybierz naród" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Wybierz gracza" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "Obserwuj %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "Obserwuj" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Nie obserwuj" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s AI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Losowy" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Obserwator" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Odłączony" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5239,96 +5231,96 @@ "Liczba graczy\n" "(łącznie z AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Poziom trudności AI:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Zestaw zasad" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Więcej opcji..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Rekord" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Ranking" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Gotowy" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "?player:Przywódca" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Drużyna" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Wybierz zapisaną grę" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Wybierz zapisaną grę:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Wybierz scenariusz" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Wybierz scenariusz:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nazwa pliku:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Zapisz grę" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Zapisane gry:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Nazwa pliku:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Zapisane scenariusze" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Zapisz scenariusz:" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Zapisz obraz mapy" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Zapisane obrazy mapy:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Zapisz obrazy mapy:" @@ -5848,7 +5840,7 @@ msgstr "" "Więcej informacji po kliknięciu lewym przyciskiem myszy na mieszkańców." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Hasło:" @@ -5886,7 +5878,7 @@ msgstr "Zmień pochodzenie" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "_Załaduj" @@ -6125,8 +6117,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6303,7 +6295,7 @@ msgstr[1] "Na pewno chcesz rozwiązać %1 jednostki?" msgstr[2] "Na pewno chcesz rozwiązać %1 jednostek?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6319,7 +6311,7 @@ msgid "Yes" msgstr "Tak" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6407,12 +6399,12 @@ msgid "This is Qt-client for Freeciv." msgstr "To jest klient Qt dla Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Nie obserwuj" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Obserwuj" @@ -6448,7 +6440,7 @@ "w wierszu poleceń po '--'. Więcej informacji w dokumentacji Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Zakończyć?" @@ -6602,9 +6594,9 @@ msgid "Game" msgstr "Gra" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opcje" @@ -6631,8 +6623,8 @@ msgid "Leave game" msgstr "Opuść grę" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6893,7 +6885,7 @@ msgstr "Stawki podatkowe..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6943,7 +6935,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Odśwież" @@ -6954,129 +6946,122 @@ # #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, klient Qt" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "łatka: %s" # -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "klient Qt" -# -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), klient Qt" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Rozpocznij nową grę" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Rozpocznij nowy scenariusz" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Wczytaj zachowaną grę" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Przyłącz się do gry sieciowej" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Połącz" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Login" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Hasło" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Potwierdź hasło" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Metaserwer internetowy" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Obserwator globalny" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Data" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "Przeglądaj..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Wczytaj scenariusz" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Przywódca" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Rozłącz" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Start" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Pliki zapisanej gry" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Otwórz pliki zapisanej gry" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Pliki scenariuszy" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Otwórz pliki scenariuszy" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Obserwator globalny" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Nie przygotowany" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Ustaw poziom trudności" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Umieść w drużynie" @@ -7179,7 +7164,7 @@ msgid "Back" msgstr "Cofnij" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Wczytaj grę" @@ -8322,45 +8307,39 @@ msgstr "Dodaj nowy plan prac" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - # #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "klient %s." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Rozpocznij nową grę" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Połącz się z..." -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Połącz się z serwerem publicznym" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Połącz się z serwerem LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Witamy w kliencie SDL..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Łatka: %s" @@ -15490,84 +15469,84 @@ msgid "?unitflag:Hunter" msgstr "?unitflag:Łowca" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv wersja %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(wersja beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv wersja %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv wersja %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "wersja testowa (beta) " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "wersja " # (obecnie prawidłowe rozwiązanie) -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "styczniu" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "lutym" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "marcu" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "kwietniu" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "maju" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "czerwcu" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "lipcu" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "sierpniu" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "wrześniu" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "październiku" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "listopadzie" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "grudniu" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15577,7 +15556,7 @@ "Freeciv %s zostanie wydana w\n" "%s, znajdziesz ją na %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15586,7 +15565,7 @@ "TO JEST WYDANIE BETA\n" "Freeciv %s zostanie wydana w %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Bo cywilizacja powinna być wolna!" @@ -16481,61 +16460,61 @@ msgstr "" "Każdy poborca podatkowy dodaje do skarbca państwa 2 sztuki złota na turę." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "?citystyle:Europejski" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "?citystyle:Klasyczny" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "?citystyle:Tropikalny" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "?citystyle:Azjatycki" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "?citystyle:Babiloński" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "?citystyle:Celtycki" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "?citystyle:Renesansowy" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "?citystyle:Przemysłowy" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "?citystyle:Współczesny" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "?citystyle:PoNowoczesny" @@ -18329,18 +18308,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "zielony" @@ -19106,14 +19085,14 @@ "miasta, które właśnie zaczęło budować cud i skończyć go w jednej turze!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbarzyński Wódz" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21067,9 +21046,9 @@ "Badacze to dzielne osoby, których możesz wykorzystać do badania nieznanego " "obszaru." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21484,8 +21463,8 @@ msgstr "" "Każdy poborca podatkowy dodaje do skarbca państwa 3 sztuki złota na turę." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "?citystyle:WiekElektryczności" @@ -21934,13 +21913,19 @@ msgstr "" "To jesteś ty. Jeśli utracisz tą jednostkę, przegrasz grę. Pilnuj jej dobrze." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Jednostkę mogą budować tylko barbarzyńcy.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "Samolot Zwiadowczy" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30915,19 +30900,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "?license:Nieznana" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Nie zainstalowano" @@ -30983,11 +30968,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Instalator dodatków Freeciv (wiersz poleceń)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Pomyślnie zainstalowano dodatek" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Nie zainstalowano dodatku: %s" @@ -31019,14 +31004,14 @@ msgid "Automatically install modpack from a given URL" msgstr "Automatycznie instaluje dodatek z podanego URLa" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Na pewno chcesz zakończyć?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Pobieram jeszcze jakiś inny plik" @@ -31034,7 +31019,7 @@ msgid "Failed to start downloader" msgstr "Nie udało się uruchomić programu pobierającego." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31043,40 +31028,40 @@ "%s%s\n" "łatka: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Zainstawano" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "?modpack:Typ" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Podtyp" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Licencja" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Zainstaluj dodatek" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "Adres URL dodatku" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Wybierz dodatek" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31086,11 +31071,11 @@ "w wierszu poleceń po '--'. Więcej informacji w dokumentacji Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Instalator dodatków Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Instalator dodatków Freeciv (gtk3)" @@ -31372,80 +31357,80 @@ msgid "A poorly-named city" msgstr "Miasto bez nazwy" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Zmiana miasta pochodzenia %s na miasto %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Przekazano %s w mieście %s z %s do %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Przekazano %s z %s do %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s utracony w wyniku przekazania dla %s miasta %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Jednostka %s utracona razem z miastem %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Nowy budynek %s powstał mieście %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Już masz miasto o nazwie %s. Zmieniono nazwę miasta na %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "Mieszkańcy miasta %s są oszołomieni twoją wiedzą technologiczną!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Robotnicy w %s spontanicznie gromadzą się i budują %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Robotnicy w mieście %s spontanicznie ulepszają drogi miejskie." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Robotnicy spontanicznie ulepszają bazy w mieście %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Założyłeś/aś miasto %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Przeniesiono %s z byłego miasta %s, by ponieważ nie może w %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -31453,7 +31438,7 @@ "W trakcie likwidacji %s twoja jednostka %s nie zdołała wysiąść i została " "stracona." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -31461,17 +31446,17 @@ "W trakcie rozwiązywania %s twoja jednostka %s w %s została uwięziona i " "została stracona." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Całkowicie zniszczyłeś/aś miasto %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Miasto %s zostało zniszczone przez %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -31479,7 +31464,7 @@ msgstr[1] "Zająłeś/aś miasto %s, zarekwirowałeś/aś %d sztuki złota!" msgstr[2] "Zająłeś/aś miasto %s, zarekwirowałeś/aś %d sztuk złota!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -31487,17 +31472,17 @@ msgstr[1] "%s podbił/a miasto %s przejmując %d sztuki złota z miasta." msgstr[2] "%s podbił/a miasto %s przejmując %d sztuk złota z miasta." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Podbiłeś/aś %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s podbił/a miasto %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -31505,7 +31490,7 @@ msgstr[1] "Oswobodziłeś/aś miasto %s!! Odebrałeś/aś %d sztuki złota." msgstr[2] "Oswobodziłeś/aś miasto %s!! Odebrałeś/aś %d sztuk złota." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -31513,55 +31498,55 @@ msgstr[1] "%s odzyskał/a miasto %s odbierając %d sztuki złota." msgstr[2] "%s odzyskał/a miasto %s odbierając %d sztuk złota." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Oswobodziłeś/aś miasto %s" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s odzyskał/a miasto %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "Handel pomiędzy %s i %s został utracony wraz miastem." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Zlikwidowano szlak handlowy między %s i %s." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "Handel pomiędzy %sm miastem %s i %s został utracony wraz ich miastem." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" "Niestety, %s anulowała szlak handlowy z miasta %s do twojego miasta %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Anulowaliśmy szlak handlowy z miasta %s do %s miasta %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " według planu prac" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s buduje %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -31569,16 +31554,16 @@ msgstr[1] "Sprzedajesz %s w mieście %s (odcięta od morza) za %d sztuki złota." msgstr[2] "Sprzedajesz %s w mieście %s (odcięta od morza) za %d sztuk złota." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Rozmiar mapy miasta %s to %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "zwiększono" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "zmniejszono" @@ -31864,20 +31849,21 @@ msgid "The %s have started building a spaceship!" msgstr "%s zaczęli budować Rakietę Kosmiczną!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "Miasto %s jest zbyt małe, aby zbudować %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Potrafi zakładać nowe miasta (populacja początkowa: %d).\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "Miasto %s skończyło budować %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -31885,57 +31871,57 @@ msgstr[1] "%s zmniejsza populację o %d. %s zmniejsza się do rozmiaru %d." msgstr[2] "%s zmniejsza populację o %d. %s zmniejsza się do rozmiaru %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Brak środków na utrzymanie %s w mieście %s, budynek sprzedany!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Za mało złota. Rozwiązano jednostkę %s" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Zanieczyszczenie koło miasta %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Festiwal poparcia dla ciebie w mieście %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Odwołano festiwal poparcia w %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "Epidemia w %s! Populacja zmniejszyła się!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Rozruchy w mieście %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "ROZRUCHY WCIĄŻ TRWAJĄ W MIEŚCIE %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Przywrócono porządek w mieście %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Lud obalił twój ustrój %s, twoje państwo stoi w ogniu." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -31943,13 +31929,13 @@ "miasta." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s zostało rozwiązane do %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31958,7 +31944,7 @@ "zapasów żywności." #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31968,7 +31954,7 @@ "wystarczających zapasów żywności." #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31978,7 +31964,7 @@ "wystarczających zapasów żywności." #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31987,7 +31973,7 @@ "aby urosnąć." #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31996,7 +31982,7 @@ "budynku, aby urosnąć." #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32004,20 +31990,20 @@ "Przesiedleńcy z %s (%s) nie mogą udać się do %s, gdyż miasto potrzebuje " "budynku, aby urosnąć." -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s zostało rozwiązane przez mieszkańców." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" "Przesiedleńcy z %s udali się do %s w poszukiwaniu lepszych warunków do życia." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" @@ -32025,7 +32011,7 @@ "życia." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" @@ -32033,47 +32019,47 @@ "życia." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "%2$s w mieście %1$s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Zanieczyszczenie koło miasta %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s zmniejsza populację w mieście %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s niszczy %s w mieście %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Zniszczono cały zapas żywności w mieście %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "Zniszczono produkcję %s w mieście %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "Obywatele %s rozważają przeniesienie się do %s." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34038,33 +34024,33 @@ msgid "Your %s was captured after completing the mission." msgstr "Twoja jednostka %s została złapana po spełnieniu misji." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Spowodowałeś/aś skandal przekupując %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "Jednostka %s spowodowała skandal przekupując twoją jednostkę %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Kradnąc technologię z %s, wywołałeś/aś skandal dyplomatyczny." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "Jednostka %s wywołała skandal dyplomatyczny, wykradając ci technologię." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Wywołałeś/aś skandal dyplomatyczny, wszczynając bunt w %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s wywołali skandal dyplomatyczny wszczynając bunt w %s." @@ -34440,19 +34426,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Czas tury jest mniejszy od zera, zmieniam na zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Serwer nie mógł rozmieścić pozycji początkowych." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Duża ilość lądów - może to zająć kilka sekund." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generator 3 nie umiejscowił wszystkich dużych wysp." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generator 3 nie umiejscowił %li lądów." @@ -34631,12 +34617,12 @@ "Robotnicy we wszystkich miastach spontanicznie ulepszają bazy, jeśli to " "tylko możliwe." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Przesunięto jednostkę %s z powodu zmiany terenu." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Rozwiązano jednostkę %s z powodu zmiany terenu." @@ -35323,8 +35309,8 @@ "być za stara wersja pliku lub uszkodzenie. Kontynuuj na własną " "odpowiedzialność." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s został/a dodany jako gracz AI, poziom %s (%s)." @@ -38154,7 +38140,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Rozejm z %s się skończył. Jesteś w stanie wojny z %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Zawieszenie broni pomiędzy %s a %s dobiegło końca. Są w stanie wojny. " +"Zrywasz sojusz z oboma stronami." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38163,51 +38158,51 @@ "Zawieszenie broni pomiędzy %s a %s dobiegło końca. Są w stanie wojny. " "Zrywasz sojusz z oboma stronami." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Nieobsługiwany typ kompresji %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Nie udało się zachować gry jako %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Gra zachowana jako %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Gra jest już uruchomiona." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Uruchamiam grę." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "Żądanie nieprawidłowego raportu (typ %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Ostrzeżenie: odrzucam przestarzałego klienta %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38215,50 +38210,50 @@ "Twój klient jest zbyt stary. Aby wejść na ten serwer musisz używać klienta w " "wersji co najmniej 2.2." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Nie możesz zmienić tej opcji." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "Naród %s nie jest dostępny w opcji wybranej przez gracza." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Naród %s jest już używany." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s to %s przywódca %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "Zmniejszam wartość allfill - za mało dostępnych narodów." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s rządzi %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -38266,33 +38261,33 @@ "Ten serwer wspiera uwierzytelnienie gracza, lecz obecnie nie jest ono w " "użyciu." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Wysyłam informację do metaserwera <%s>" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Nie zaczynam bez wyraźnego sygnału od metaserwera." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Gra skończona..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "Nie udało się stworzyć odpowiedniej mapy, próbuję z innym ziarnem mapy" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Nie można stworzyć mapy przy podanych ustawieniach." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opcja %s została zmieniona z %s na %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Teraz oczekuję nowych połączeń." @@ -40145,17 +40140,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "Za mała produkcja nauki. Straciliśmy Tech. Przysz. %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Za mała produkcja nauki. Straciliśmy %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -40164,7 +40159,7 @@ "Utraciliśmy technologię, która pozwalała na nasz ustrój '%s'. Obywatele " "rozpoczęli rewolucję, w celu wporwadzenia '%s'." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -40173,32 +40168,32 @@ "Utraciliśmy technologię, która pozwalała na nowy ustrój '%s'. Obywatele " "wybrali '%s' na nowy ustrój." -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s nie może zbudować %s. Wymagana technologia została utracona." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Cel badań to %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Kradniesz %s od %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s ukradli ci %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s ukradli %s od %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -41156,6 +41151,20 @@ msgid "error %d (compiled without strerror)" msgstr "błąd %d (skompilowano bez strerror)" +# +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), klient %s." + +# +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), klient Qt" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "Miasto %s jest zbyt małe, aby zbudować %s." + #~ msgid "LAN" #~ msgstr "LAN" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/pt_BR.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/pt_BR.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/pt_BR.po freeciv-2.5.8/translations/freeciv/pt_BR.po --- freeciv-2.5.7/translations/freeciv/pt_BR.po 2017-05-13 12:07:58.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/pt_BR.po 2017-08-12 11:54:43.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.1.0-beta3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-02-02 11:49-0200\n" "Last-Translator: Djavan Fagundes \n" "Language-Team: Brazilian Portuguese \n" @@ -346,12 +346,12 @@ "*%s (IA)* Nós fomos atacados selvagemente por %s, e precisamos da sua ajuda! " "Honre a nossa gloriosa aliança e o seu nome nunca mais será esquecido!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Os %s pararam de construir: %s em %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Os %s começaram a construir: %s em %s." @@ -387,7 +387,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -783,13 +783,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1925,10 +1925,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bandeira" @@ -2649,7 +2649,7 @@ msgstr "Que Nação Irá Personificar?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Selecione uma Nação" @@ -3313,16 +3313,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nome" @@ -3434,11 +3434,11 @@ msgstr "Nações" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipo" @@ -3612,9 +3612,9 @@ msgid "Seen (Invis)" msgstr "Ver (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Desconhecido" @@ -3736,7 +3736,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Informe bugs em %s\n" @@ -3760,7 +3760,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "?noun:Ver" @@ -4136,12 +4136,12 @@ msgid "Load Lua Script" msgstr "_Ativar unidade" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construir Nova Cidade" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4174,8 +4174,8 @@ msgid "Set local options" msgstr "Definir opções locais" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Opções do Jogo" @@ -4557,8 +4557,8 @@ msgid "Game/Scenario Properties" msgstr "Propriedades do Jogo/Cenário" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Salvar Cenário" @@ -4929,7 +4929,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Este comando é apenas de cliente." @@ -4940,7 +4940,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4948,370 +4948,363 @@ "%s client" msgstr "Este comando é apenas de cliente." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Este comando é apenas de cliente." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Iniciar _Novo Jogo" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Iniciar jogo de _cenário" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Carregar jogo salvo" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onectar à jogo em rede" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Conectar à _zona de jogo" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Selecionar local para salvar" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Navegar..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Senhas não correspondem, insira senha." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servidor" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Porta" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versão" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Estado" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Jogadores" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Humano" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Comentário" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Rede _Local" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Metaservidor de Internet" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Servidor:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Porta:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Conectar..." -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Senha:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irmar senha:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Servidor" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "C_onectar" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Nome da conexão: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nome do jogador: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Servidor: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Jogador/info conec" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Alternar estado do jogador" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Selecione nação" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observar este jogador" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Tomar este jogador" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Cortar conexão" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Alternar jogador IA" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Remover jogador" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Obter informações de acesso" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Pôr em %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Não está pron_to" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Pronto" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Iniciar" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Terreno %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Selecionar uma _Nação" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "_Pegar jogador" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Observador: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observar" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Não _observar" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s IA>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Aleatório" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Observador" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Desanexar" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Número de joga_dores (Incluindo o IA):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Níve_l de experiência IA:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Deserto" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Mais Opções..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Record" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Avaliação" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Pronto" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Líder" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Time" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Selecione um jogo salvo para carregar" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Selecione um jogo salvo para ca_rregar:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Escolha o cenário" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Escolha o _cenário:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Nome do arquivo:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Salvar o Jogo" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "_Jogos Salvos" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Salvar _Arquivo:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Salvar Cenário" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Salvar Cenário" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Salvar o Jogo" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "_Jogos Salvos" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "_Jogos Salvos" @@ -5845,7 +5838,7 @@ msgstr "" "Informações adicionais estão disponíveis via clique do mouse nos cidadãos." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Senha:" @@ -5886,7 +5879,7 @@ msgstr "Faz Terra Natal" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Abrir" @@ -6159,8 +6152,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6351,7 +6344,7 @@ msgstr[0] "Tem certeza que deseja sair?" msgstr[1] "Tem certeza que deseja sair?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6367,7 +6360,7 @@ msgid "Yes" msgstr "Sim" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6455,13 +6448,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Cliente para o Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Não _observar" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Observar" @@ -6495,7 +6488,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Sair" @@ -6667,9 +6660,9 @@ msgid "Game" msgstr "Jogo" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opções" @@ -6698,8 +6691,8 @@ msgid "Leave game" msgstr "Sair do Jogo" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6979,7 +6972,7 @@ msgstr "Taxa imposto..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7031,7 +7024,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Recarregar" @@ -7042,143 +7035,137 @@ msgstr "Aplicar uma vez" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Este comando é apenas de cliente." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unidade: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Este comando é apenas de cliente." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Este comando é apenas de cliente." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Iniciar jogo de _cenário" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Abrir Jogo Salvo" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "C_onectar à jogo em rede" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Ligar" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Conectar:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Senha:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Conf_irmar senha:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "_Metaservidor de Internet" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Observador Global" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Navegar..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Salvar Cenário" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Lider:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Desconectar" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Iniciar" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Salvar Jogadores" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Salvar _Arquivo:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Nome do cenário" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Nome do cenário" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Observador Global" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Não está pron_to" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", nível de dificuldade %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Pôr em %s" @@ -7290,7 +7277,7 @@ msgid "Back" msgstr "Anterior" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Ler Jogo" @@ -8430,44 +8417,38 @@ msgstr "Adicionar Lista de Tarefas" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versão %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Este comando é apenas de cliente." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Iniciar Novo Jogo" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Entrar no Jogo" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Entrar no Servidor público" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Entrar no Servidor da LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDLClient lhe dá boas vindas..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Cidade %s" @@ -15606,83 +15587,83 @@ msgid "?unitflag:Hunter" msgstr "Helicóptero" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versão %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versão beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versão %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versão %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versão de teste beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versão " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Janeiro" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Fevereiro" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Março" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Abril" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Maio" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Junho" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Julho" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Agosto" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Setembro" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Outubro" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Novembro" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Dezembro" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15691,7 +15672,7 @@ "ESTA É UMA VERSÃO BETA\n" "O Freeciv %s será lançado em %s, as %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15700,7 +15681,7 @@ "ESTA É UMA VERSÃO BETA\n" "O Freeciv %s será lançado em %s, as %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Porque a civilização deve ser livre!" @@ -16606,61 +16587,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Europeu" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Clássico" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropical" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Leste asiático" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babilônios" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Céltico" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Renascença" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Industrial" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Moderno" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Pós-moderno" @@ -18480,18 +18461,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "verde" @@ -19211,14 +19192,14 @@ "terminando-a num único turno!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Líder Bárbaro" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21204,9 +21185,9 @@ "Exploradores são indivíduos muito bravos e muito úteis para mapear " "território desconhecido." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21627,8 +21608,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Era da eletricidade" @@ -22061,13 +22042,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "Este é você, se você perdeu esta unidade, você perdeu o jogo. Ou não" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Apenas bárbaros podem construir isso.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "SAAC" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30871,20 +30858,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Desconhecido" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -30939,12 +30926,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Selecionar um Avanço a Roubar" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s transportado com sucesso." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -30976,14 +30963,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Tem certeza que deseja sair?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -30992,60 +30979,60 @@ msgid "Failed to start downloader" msgstr "Falhou ao criar novo jogador %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Selecionar um Avanço a Roubar" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Selecionar um Avanço a Roubar" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Selecionar um Avanço a Roubar" @@ -31329,50 +31316,50 @@ msgid "A poorly-named city" msgstr "Uma cidade de nome incorreto" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Alterada cidade base de %s para %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, fuzzy, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Transferido %s em %s de %s para %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, fuzzy, c-format msgid "Transferred %s from %s to %s." msgstr "Transferido %s de %s para %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s perdido na transferência para %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s perdido junto com o controle de %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Um substituto %s está construindo %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Já possui uma cidade denominada %s. A cidade foi renomeada para %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -31380,159 +31367,159 @@ " Trabalhadores juntam-se espontaneamente e equipam a cidade com estrada " "de ferro." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Você fundou %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Movido %s para fora da cidade dispersa %s desde que não pôde ficar em %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Quando %s foi dispersa, seu %s não pôde ficar, e portanto, estará perdido." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Quando %s foi dispersa, seu %s não pôde ficar, e portanto, estará perdido." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Você destruiu completamente %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s foi destruido por %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Sua conquista %s; sua pilhage acumulou %d de moedas!" msgstr[1] "Sua conquista %s; suas pilhagens acumularam %d de moedas!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s conquistada %s e pilhado %d de moedas da cidade." msgstr[1] "%s conquistada %s e pilhados %d de moedas da cidade." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Você conquistou %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s conquistada %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Você liberou %s! Pilhagem acumulou %d de moedas." msgstr[1] "Você liberou %s! Pilhagens acumularam %d de moedas." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s liberado %s e pilhado %d de moedas da cidade." msgstr[1] "%s liberados %s e pilhados %d de moedas da cidade." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Você libertou %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s libertada %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, fuzzy, c-format msgid "Trade between %s and %s lost along with city." msgstr "Rota entre %s e %s cancelado." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Rota entre %s e %s cancelado." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Desculpe, o %s cancelou a rota comercial de %s para a sua cidade %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Desculpe, o %s cancelou a rota comercial de %s para a sua cidade %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " da lista de tarefas" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s está construindo %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Você vende %s em %s (agora isolado) por %d moedas." msgstr[1] "Você vende %s em %s (agora isolado) por %d moedas." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "O %s de %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Base aérea" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -31816,77 +31803,78 @@ msgid "The %s have started building a spaceship!" msgstr "Os %s começaram a construir uma nave espacial!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s ainda não pode construir %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Pode construir novas cidades.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s terminou de construir %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Não podemos financiar a manutenção de %s em %s, construção vendida!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Sem moedas suficientes. %s debandada" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Poluição perto de %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Celebrações em honra a você em %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Celebrações canceladas em %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s foi pega por uma praga! População perdida!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Desordem civil em %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "DESORDEM CIVIL CONTINUA em %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Ordem restaurada em %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "O povo derrubou sua %s, sua nação está em tumulto." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -31894,13 +31882,13 @@ "cidade." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s debandada em %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31909,7 +31897,7 @@ "suficiente disponível!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31919,7 +31907,7 @@ "suficiente disponível!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31929,7 +31917,7 @@ "suficiente disponível!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31938,7 +31926,7 @@ "para se expandir!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31947,7 +31935,7 @@ "melhoria para se expandir!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -31955,72 +31943,72 @@ "Migrante de %s (%s) não é possível ir à %s pelo fato de precisar de uma " "melhoria para se expandir!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s debandada por seus moradores." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Migrante de %s movidos para %s em busca de uma vida melhor." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Migrante de %s movidos para %s (%s) em busca de uma vida melhor." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Migrante de %s (%s) movidos para %s em busca de uma vida melhor." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s sofreu um ataque nuclear dos %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Poluição perto de %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Fome causa redução de população em %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "Os %s destruíram %s em %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "O seu %s destruiu %s em %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Produção de %s atualizada para %s em %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" "Moradores de %s estão pensando em migrar para %s em busca de uma vida melhor." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33938,32 +33926,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Seu %s foi capturado após terminar a sua missão." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Você causou um incidente ao subornar o %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s causou um incidente ao subornar o seu %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Você causou um incidente ao tentar roubar tecnologia dos %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s causou um incidente ao tentar roubar tecnologia de você." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Você causou um incidente ao incitar uma revolta em %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s causou um incidente ao incitar uma revolta em %s." @@ -34341,19 +34329,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "A expiração de turno é menor do que zero, corrigindo para zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Massa terrestre elevada - isto pode levar alguns segundos." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Gerador 3 não colocou todas as ilhas maiores." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Gerador 3 deixou %li massas terrestres sem colocar." @@ -34540,12 +34528,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "%s movido para alterar o terreno." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "%s debandou para alterar o terreno." @@ -35225,8 +35213,8 @@ "com jogos gravados antigos, ou pode indicar um jogo gravado inválido. " "Prossiga por sua conta e risco." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s foi adicionado como %s nível de jogador controlado por IA." @@ -38004,7 +37992,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "O cessar-fogo com %s irá expirar. Você está agora em guerra com %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Cessar-fogo entre %s e %s acabou. Eles estão agora em guerra. Você cancelou " +"sua aliança com ambos." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -38013,49 +38010,49 @@ "Cessar-fogo entre %s e %s acabou. Eles estão agora em guerra. Você cancelou " "sua aliança com ambos." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "Tipos de compressão não suportado %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Falha ao salvar jogo como %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Jogo salvo como %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "O jogo já está sendo jogado." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "%s perdeu o controle cmdlevel no início do jogo. Use a votação agora." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Iniciando jogo." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "pedido de relatório desconhecido (tipo %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Aviso: rejeitando cliente antigo %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38063,52 +38060,52 @@ "O seu cliente é muito antigo. Para usar este servidor, por favor, atualize o " "seu cliente para o Freeciv 2.2 ou superior." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Você não está autorizado a editar." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "A nação %s não está disponível no cenário." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "A nação %s já está em uso." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s o %s é governante %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" "Aguardando a hora de início: %d de %d jogadores estão prontas para iniciar." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 #, fuzzy msgid "not enough playable nations" msgstr "" "Reduzindo campo de IA pelo fato de não haver nações jogáveis suficientes." -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s regra o %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 #, fuzzy msgid "" "This freeciv-server program has player authentication support, but it's " @@ -38117,36 +38114,36 @@ "Este programa do servidor possui um suporte de autenticação de jogadores, " "mas não está atualmente em uso." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Enviando informação para o metaservidor [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Não iniciando sem explicitamente requisitar conexão com metaservidor." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "O jogo acabou..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "" "Não é possível criar unidades no %s pelo fato da unidade dada de id %d ser " "inválida." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opção: %s foi alterada para \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Agora aceitando novas conexões de clientes." @@ -40010,56 +40007,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Aumenta a produção científica de uma cidade em 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "O sucesso tecnológicos é %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Você roubou %s da cidade %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr " %s roubou %s de você!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s roubaram %s dos %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -40981,6 +40978,21 @@ msgstr "erro %d (compilado sem strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Este comando é apenas de cliente." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Este comando é apenas de cliente." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versão %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ainda não pode construir %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/pt.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/pt.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/pt.po freeciv-2.5.8/translations/freeciv/pt.po --- freeciv-2.5.7/translations/freeciv/pt.po 2017-05-13 12:07:57.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/pt.po 2017-08-12 11:54:43.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Duarte Loreto \n" "Language-Team: \n" @@ -290,12 +290,12 @@ "our glorious alliance and your name will never be forgotten!" msgstr "" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "Os %s pararam de construir %s em %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "Os %s iniciaram a construção de %s em %s." @@ -328,7 +328,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -729,13 +729,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1873,10 +1873,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bandeira" @@ -2628,7 +2628,7 @@ msgstr "Que Nação Irá Personificar?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 #, fuzzy msgid "Pick Nation" @@ -3299,16 +3299,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nome" @@ -3429,11 +3429,11 @@ msgstr "Nação" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipo" @@ -3608,9 +3608,9 @@ msgid "Seen (Invis)" msgstr "Seleccionar Unidade(s)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Desconhecido" @@ -3733,7 +3733,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Relate erros (bugs) para <%s> (em Inglês).\n" @@ -3757,7 +3757,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4143,12 +4143,12 @@ msgid "Load Lua Script" msgstr "Unidades terrestres" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construir Nova Cidade" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4180,8 +4180,8 @@ msgid "Set local options" msgstr "Definir opções locais" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 #, fuzzy msgid "Game Settings" @@ -4601,8 +4601,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Iniciar Novo Jogo" @@ -4997,7 +4997,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Este comando é apenas de cliente." @@ -5008,7 +5008,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5016,402 +5016,395 @@ "%s client" msgstr "Este comando é apenas de cliente." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Este comando é apenas de cliente." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 #, fuzzy msgid "Start _New Game" msgstr "Iniciar Novo Jogo" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 #, fuzzy msgid "Start _Scenario Game" msgstr "Iniciar Novo Jogo" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 #, fuzzy msgid "_Load Saved Game" msgstr "Ler Jogo" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 #, fuzzy msgid "Connect to Gaming _Zone" msgstr "Ligar a esta localização" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 #, fuzzy msgid "Select Location to Save" msgstr "Seleccione uma nação e nome" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nome Servidor" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Porto" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versão" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Estado" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Jogadores" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Humano" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Observações" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 #, fuzzy msgid "Internet _Metaserver" msgstr "Metaservidor" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Servidor:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Porto:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 #, fuzzy msgid "_Login:" msgstr "Legião" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Servidor" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 #, fuzzy msgid "C_onnect" msgstr "Ligar" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, fuzzy, c-format msgid "Connection name: %s" msgstr "A Ligar" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, fuzzy, c-format msgid "Player name: %s" msgstr "?city:Nome" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, fuzzy, c-format msgid "Host: %s" msgstr "Máquina:" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, fuzzy, c-format msgid "%s info" msgstr "Informação cidade" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 #, fuzzy msgid "Toggle player ready" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 #, fuzzy msgid "Pick nation" msgstr "Esquadra de Polícia" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 #, fuzzy msgid "Take this player" msgstr "Cidades" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 #, fuzzy msgid "Cut connection" msgstr "A terminar a ligação %s." -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 #, fuzzy msgid "Aitoggle player" msgstr "aitoggle " -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 #, fuzzy msgid "Remove player" msgstr "A remover o jogador %s." #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Embaixada" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, fuzzy, c-format msgid "Put on %s" msgstr "População: %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 #, fuzzy msgid "_Ready" msgstr "P_reparar todas" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 #, fuzzy msgid "_Start" msgstr "Estado" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Terreno %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 #, fuzzy msgid "Pick _Nation" msgstr "Esquadra de Polícia" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Cidades" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr " (observador)" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 #, fuzzy msgid "_Observe" msgstr " (observador)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "controla agora" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "IA" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 #, fuzzy msgid "Random" msgstr "Rádio" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 #, fuzzy msgid "Observer" msgstr " (observador)" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 #, fuzzy msgid "Detached" msgstr ", Morto" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Número de jogadores a encher com IA's" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Deserto" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 #, fuzzy msgid "_More Game Options..." msgstr "Opções das Mensagens..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 #, fuzzy msgid "Record" msgstr "Relatório" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 #, fuzzy msgid "Rating" msgstr "A aguardar" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 #, fuzzy msgid "Ready" msgstr "Activar todas" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?city:Nome" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Equipa" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 #, fuzzy msgid "Choose a Scenario" msgstr "Ler Cenário" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 #, fuzzy msgid "Choose a _Scenario:" msgstr "Ler Cenário" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #, fuzzy msgid "Saved _Games:" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 #, fuzzy msgid "Save _Filename:" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Iniciar Novo Jogo" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Iniciar Novo Jogo" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Gravar Jogo" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Gravar Jogo" @@ -5953,7 +5946,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Oásis" @@ -5993,7 +5986,7 @@ msgstr "Tornar cidade origem" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "Estrada" @@ -6269,8 +6262,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6457,7 +6450,7 @@ msgstr[0] "" msgstr[1] "" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6473,7 +6466,7 @@ msgid "Yes" msgstr "Sim" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6563,13 +6556,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Cliente para o Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "controla agora" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr " (observador)" @@ -6602,7 +6595,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Sair" @@ -6773,9 +6766,9 @@ msgid "Game" msgstr "Jogo" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opções" @@ -6805,8 +6798,8 @@ msgid "Leave game" msgstr "Gravar Jogo" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7094,7 +7087,7 @@ msgstr "Taxa Imposto..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7147,7 +7140,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Actualizar (Lista)" @@ -7158,143 +7151,137 @@ msgstr "Aplicar uma v_ez" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Este comando é apenas de cliente." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unidade %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Este comando é apenas de cliente." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Este comando é apenas de cliente." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Gravar Jogo" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Ligar" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Ligar" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Legião" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Oásis" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Oásis" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Metaservidor" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr " (observador)" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "" -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Lider:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Desligar" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 #, fuzzy msgid "Start" msgstr "Estado" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Cidades" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Gravar Jogo" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Iniciar Novo Jogo" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr " (observador)" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr ", não pronto" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr "Dificuldade:" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "População: %s" @@ -7408,7 +7395,7 @@ msgid "Back" msgstr "Banco" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Ler Jogo" @@ -8603,46 +8590,40 @@ msgstr "Renomear lista tarefas" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versão %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Este comando é apenas de cliente." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Iniciar Novo Jogo" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "Juntar-se a Jogo" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " (observador)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Cidade %s" @@ -15593,83 +15574,83 @@ msgid "?unitflag:Hunter" msgstr "Helicóptero" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versão %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versão beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versão %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versão %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versão de teste beta " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versão " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Janeiro" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Fevereiro" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Março" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Abril" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Maio" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Junho" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Julho" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Agosto" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Setembro" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Outubro" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Novembro" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Dezembro" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15679,7 +15660,7 @@ "Freeciv %s será lançado em\n" "%s, em %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15689,7 +15670,7 @@ "Freeciv %s será lançado em\n" "%s, em %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Porque civilization deveria ser livre!" @@ -16596,69 +16577,69 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 #, fuzzy msgid "?citystyle:European" msgstr "?city_state:Celebração" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 #, fuzzy msgid "?citystyle:Classical" msgstr "Clássico" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 #, fuzzy msgid "?citystyle:Asian" msgstr "?city:Nome" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 #, fuzzy msgid "?citystyle:Babylonian" msgstr "?plural:Babilónios" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 #, fuzzy msgid "?citystyle:Celtic" msgstr "?city_state:Paz" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 #, fuzzy msgid "?citystyle:Renaissance" msgstr "Renascença" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 #, fuzzy msgid "?citystyle:Industrial" msgstr "?city:Nome" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 #, fuzzy msgid "?citystyle:Modern" msgstr "?city_state:Desordem" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 #, fuzzy msgid "?citystyle:PostModern" msgstr "?city_state:Desordem" @@ -18436,18 +18417,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 #, fuzzy msgid "green" msgstr "Prefixar" @@ -19104,14 +19085,14 @@ "terminando-a num único turno!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Líder Bárbaro" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21012,9 +20993,9 @@ "territory." msgstr "Exploradores são muito úteis para mapear território desconhecido." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21425,8 +21406,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "?city_state:Paz" @@ -21853,13 +21834,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Jogo: Apenas as unidades páraquedistas podem fazer isso." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "SCAA" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29511,20 +29498,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Desconhecido" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29579,12 +29566,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Selectione Avanço a Roubar" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s transportado com sucesso." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29616,13 +29603,13 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29631,60 +29618,60 @@ msgid "Failed to start downloader" msgstr "Erro ao criar novo jogador IA: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Selectione Avanço a Roubar" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Selectione Avanço a Roubar" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Selectione Avanço a Roubar" @@ -29956,50 +29943,50 @@ msgid "A poorly-named city" msgstr "Uma cidade de nome incorrecto" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Alterada cidade base de %s para %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Transferido %s em %s de %s para %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Transferido %s de %s para %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s foi perdido na transferência para %s %s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, fuzzy, c-format msgid "%s lost along with control of %s." msgstr "%s controla agora %s" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Foi construido um novo %s em %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Já possui uma cidade denominada %s. A cidade foi renomeada para %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" @@ -30007,159 +29994,159 @@ " Trabalhadores juntam-se espontaneamente e equipam a cidade com " "caminhos de ferro." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, fuzzy, c-format msgid "You have founded %s." msgstr "Você fundou %s" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Jogo: Movido %s para fora da cidade dispersa %s para evitar ficar preso." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, fuzzy, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" " Quando %s foi dispersa a sua %s não conseguiu sair, pelo que ficou presa." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" " Quando %s foi dispersa a sua %s não conseguiu sair, pelo que ficou presa." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Você destruiu completamente %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s foi destruido por %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, fuzzy, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Você conquistou %s, a pilhagem acumulou %d moedas!" msgstr[1] "Você conquistou %s, a pilhagem acumulou %d moedas!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, fuzzy, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s conquistou %s e pilhou %d moedas da cidade." msgstr[1] "%s conquistou %s e pilhou %d moedas da cidade." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Você atacou os %s com armas nucleares." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, fuzzy, c-format msgid "%s conquered %s." msgstr "%s descobrem %s" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, fuzzy, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Você libertou %s! A pilhagem acumulou %d moedas." msgstr[1] "Você libertou %s! A pilhagem acumulou %d moedas." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, fuzzy, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s libertou %s e pilhou %d moedas da cidade." msgstr[1] "%s libertou %s e pilhou %d moedas da cidade." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, fuzzy, c-format msgid "You have liberated %s!" msgstr "Você fundou %s" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, fuzzy, c-format msgid "%s liberated %s." msgstr "%s governa os %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr " Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr " Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " da lista de tarefas" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s está a construir %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Você vende %s em %s (agora isolado) por %d moedas." msgstr[1] "Você vende %s em %s (agora isolado) por %d moedas." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "O %s dos %s" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Base Aérea" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30443,77 +30430,78 @@ msgid "The %s have started building a spaceship!" msgstr "Os %s iniciaram a construção de uma nave espacial!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s ainda não podem construir %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Pode construir novas cidades.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s terminou a construção de %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Não dispõe de fundos para manter %s em %s, edifício vendido!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "%s não pode manter %s, unidade dissolvida." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Poluição perto de %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Jogo: Cancelamento das celebrações do \"Dia de Adoração de %s\" em %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Jogo: Cancelamento das celebrações do \"Dia de Adoração de %s\" em %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Desordem pública em %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "DESORDEM PÚBLICA CONTINUA em %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Ordem reposta em %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "O povo derrubou a(o) sua(seu) %s, o seu país está em tumulto." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -30521,20 +30509,20 @@ "cidade." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s é dissolvida em %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30542,7 +30530,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30550,91 +30538,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s é dissolvida em %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s sofreu um ataque nuclear dos %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Poluição perto de %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Fome causa redução de população em %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "Os %s destruíram %s em %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "O seu %s destruiu %s em %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Produção de %s é incrementada para %s em %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32484,32 +32472,32 @@ msgid "Your %s was captured after completing the mission." msgstr "O seu %s foi capturado após terminar a sua missão." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Você causou um incidente ao subornar o %s de %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s causou um incidente ao subornar o seu %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, fuzzy, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Você causou um incidente ao roubar tecnologia de %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, fuzzy, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s causou um incidente ao roubar-lhe tecnologia." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Você causou um incidente ao incitar uma revolta em %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s causou um incidente ao incitar uma revolta em %s." @@ -32832,19 +32820,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "A expiração de turno é menor do que zero, a corrigir para zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Massa terrestre elevada - isto pode levar alguns segundos." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Gerador 3 não colocou todas as ilhas maiores." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Gerador 3 deixou %li massas terrestres por colocar." @@ -33028,12 +33016,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, fuzzy, c-format msgid "Moved your %s due to changing terrain." msgstr " Foi movido o seu %s devido à alteração de mar para terra em (%d, %d)." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, fuzzy, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -33722,8 +33710,8 @@ "com jogos gravados antigos, ou pode indicar um jogo gravado inválido. " "Prossiga por sua conta e risco." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s foi acrescentado como um jogador controlado por IA." @@ -36330,7 +36318,15 @@ msgstr "" " O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +" O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36338,131 +36334,131 @@ msgstr "" " O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "opções suportadas: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Falha ao gravar o jogo como %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Jogo gravado como %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "O jogo já foi iniciado." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "A iniciar o jogo." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "pedido de relatório desconhecido (tipo %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, fuzzy, c-format msgid "Warning: rejecting old client %s" msgstr "Aviso: Receia-se fome em %s." -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Você não está autorizado a definir esta opção." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Explicações disponíveis para as seguintes opções do servidor:" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, fuzzy, c-format msgid "%s nation is already in use." msgstr "O jogo já foi iniciado." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s é o governante %s %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s governa os %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "A enviar informação para o metaservidor [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "O jogo terminou..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Jogo: Você não pode subornar uma unidade desta nação." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opção: %s foi alterada para \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "A aceitar novas ligações de clientes." @@ -38340,56 +38336,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%s são os primeiros a aprender %s" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Fundos insuficientes, custo de actualização de %d moedas." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Objectivo tecnológico é %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Você roubou %s aos %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "Os %s roubaram-lhe %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "Os %s roubaram %s aos %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39296,6 +39292,21 @@ msgstr "erro %d (compilado sem strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Este comando é apenas de cliente." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Este comando é apenas de cliente." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versão %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ainda não podem construir %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ro.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ro.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ro.po freeciv-2.5.8/translations/freeciv/ro.po --- freeciv-2.5.7/translations/freeciv/ro.po 2017-05-13 12:07:58.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ro.po 2017-08-12 11:54:44.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: po-debconf://kdebase\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: stan ioan-eugen \n" "Language-Team: romanian \n" @@ -345,12 +345,12 @@ "*%s (AI)* Am fost atacaţi cu sălbăticie de %s, şi avem nevoie de ajutorul " "tău! Onorează alianţa noastra şi numele tău nu va fi amintit pe veci!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%si nu mai construiesc %s în %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%si construiesc %s în %s." @@ -386,7 +386,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -790,13 +790,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1945,10 +1945,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Drapel" @@ -2688,7 +2688,7 @@ msgstr "Cărei naţii vreţi să-i aparţineţi?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Alegeţi naţiunea" @@ -3356,16 +3356,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Nume" @@ -3488,11 +3488,11 @@ msgstr "Naţiuni" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tipul" @@ -3666,9 +3666,9 @@ msgid "Seen (Invis)" msgstr "Alege Unitatea" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Necunoscut" @@ -3791,7 +3791,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "Raportează erorile la <%s>.\n" @@ -3815,7 +3815,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4195,12 +4195,12 @@ msgid "Load Lua Script" msgstr "Încarcă unitatea" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Construieşte un Oraş Nou" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4234,8 +4234,8 @@ msgid "Set local options" msgstr "Seteză opţiunile locale" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Setările jocului" @@ -4649,8 +4649,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "Începe un _scenariu de joc" @@ -5046,7 +5046,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Această comandă este valabilă doar pentru client." @@ -5057,7 +5057,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -5065,374 +5065,367 @@ "%s client" msgstr "Această comandă este valabilă doar pentru client." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Această comandă este valabilă doar pentru client." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Începe un joc _nou" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Începe un _scenariu de joc" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Încarcă un joc salvat" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "C_onexiune la joc în reţea" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Concetează-te la Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Alegeţi locaţia pentru salvat" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "Răsfoieşte..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Parolele diferă, introduceţi parola." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Nume Server" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Versiune" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Stare" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Jucători" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Om" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Comentariu" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Reţea loc_ală" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Gazdă:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Login:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Parola:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Conf_irmaţi parola:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Host" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Conectează" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Numele conexiunii: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Nume jucător: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Gazdă: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Informaţii jucător/conexiune" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "info %s " -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Schimbă starea jucătorului" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Alege naţiunea" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Observă acest jucător" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Preluaţi acest jucător" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Terminaţi conexiunea" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Schimbă modul AI pentru jucător" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Îndepărtează jucătorul" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Oferă acces info" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Pune în %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Nepregătit" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "P_regătit" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Start" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Pătratul %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Alege _naţiunea" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Preluaţi acest jucător" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Observator: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Observă" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "Nu _observa" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Aleator" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr " Observator" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Deataşat" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Număr de jucători (inclusiv AI):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "Nivel de dificultate _AI:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Deşert" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Opţiuni suplimentare pentru joc..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Înregistrare" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Rating" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Gata" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "?Player:Nume" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Echipa" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Alegeţi jocul pentru încărcat" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Alegeţi jocu_l pentru încărcat" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Alegeţi un scenariu" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Alegeţi un _scenariu:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Nume fişier salvare:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Salvează joc" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Jocuri salvate:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Nume fişier salvare:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Începe un _scenariu de joc" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Începe un _scenariu de joc" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Salvează joc" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Jocuri salvate:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Jocuri salvate:" @@ -5967,7 +5960,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "Parola:" @@ -6007,7 +6000,7 @@ msgstr "Creaţi un nou oraş natal" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Drum" @@ -6282,8 +6275,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6474,7 +6467,7 @@ msgstr[0] "Sigur vrei să renunţi?" msgstr[1] "Sigur vrei să renunţi?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6490,7 +6483,7 @@ msgid "Yes" msgstr "Da" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6578,13 +6571,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Client Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Nu _observa" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Observă" @@ -6618,7 +6611,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Termină" @@ -6791,9 +6784,9 @@ msgid "Game" msgstr "Joc" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Opţiuni" @@ -6822,8 +6815,8 @@ msgid "Leave game" msgstr "Salvează joc" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7111,7 +7104,7 @@ msgstr "Rata taxelor..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7164,7 +7157,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Actualizează" @@ -7175,143 +7168,137 @@ msgstr "Aplică o singură dată" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Această comandă este valabilă doar pentru client." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Unitatea %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Această comandă este valabilă doar pentru client." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Această comandă este valabilă doar pentru client." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Porneşte joc nou" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Începe un _scenariu de joc" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Încarcă joc salvat" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "C_onexiune la joc în reţea" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Conectează" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Autentificare:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Parola:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Conf_irmaţi parola:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr " Observator" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "Răsfoieşte..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Începe un _scenariu de joc" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Conducător:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Deconectează" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Porneşte" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Preluaţi acest jucător" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Nume fişier salvare:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Începe un _scenariu de joc" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Începe un _scenariu de joc" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr " Observator" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Nepregătit" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", nivel %s de dificultate" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Pune în %s" @@ -7423,7 +7410,7 @@ msgid "Back" msgstr "Înapoi" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Încarcă joc" @@ -8601,47 +8588,41 @@ msgstr "Adaugă plan nou de lucru" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv versiunea %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Această comandă este valabilă doar pentru client." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Porneşte joc nou" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "Nume de autentificare" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " (observator)" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 #, fuzzy msgid "Join LAN Server" msgstr "Servere LAN" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Oraşul %s" @@ -15945,83 +15926,83 @@ msgid "?unitflag:Hunter" msgstr "Elicopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv versiunea %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(versiune beta)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv versiunea %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv versiunea %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "versiunea betatest" -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "versiunea " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Ianuarie" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Februarie" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Martie" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Aprilie" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mai" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Iunie" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Iulie" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "August" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Septembrie" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Octombrie" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Noiembrie" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Decembrie" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16031,7 +16012,7 @@ "Freeciv %s va fi gata in\n" "%s, la %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -16041,7 +16022,7 @@ "Freeciv %s va fi gata in\n" "%s, la %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Pentru că civilizaţia trebuie să fie liberă!" @@ -16891,69 +16872,69 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 #, fuzzy msgid "?citystyle:European" msgstr "Bucurie" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 #, fuzzy msgid "?citystyle:Classical" msgstr "Clasic" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 #, fuzzy msgid "?citystyle:Asian" msgstr "?city:Nume" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 #, fuzzy msgid "?citystyle:Babylonian" msgstr "Babilonieni" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 #, fuzzy msgid "?citystyle:Celtic" msgstr "Linişte" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 #, fuzzy msgid "?citystyle:Renaissance" msgstr "Linişte" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 #, fuzzy msgid "?citystyle:Industrial" msgstr "?city:Nume" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 #, fuzzy msgid "?citystyle:Modern" msgstr "Dezordine" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 #, fuzzy msgid "?citystyle:PostModern" msgstr "Dezordine" @@ -18663,18 +18644,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "verde" @@ -19310,14 +19291,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Conducător de barbari" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21156,9 +21137,9 @@ "territory." msgstr "Exploratori sunt de folos la descoperirea de teritoriu necunoscut." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21547,8 +21528,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "Linişte" @@ -21966,13 +21947,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Joc: Doar paraşutişti pot face aşa ceva." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29104,20 +29091,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Necunoscut" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29172,12 +29159,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Selectaţi Avansat pentru a fura" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s a fost transportat cu succes." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29209,14 +29196,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Sigur vrei să renunţi?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29225,60 +29212,60 @@ msgid "Failed to start downloader" msgstr "Eroare la crearea unui nou jucător AI: %s." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Selectaţi Avansat pentru a fura" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Selectaţi Avansat pentru a fura" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Selectaţi Avansat pentru a fura" @@ -29568,82 +29555,82 @@ msgid "A poorly-named city" msgstr "Un oraş denumit greşit" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Noul oraş natal al %s este %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%s în %s transferat de la %s la %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Transferat %s de la %s la %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s a fost pierdut în transfer către al lui %s %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s a fost pierdut odată cu pierderea controlului asupra %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr "Un nou %s a fost construit în %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Aţi avut un oraş numit %s. Oraşul a fost redenumit %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Locuitori din %s sunt uimiţi de cunoştinţele dumneavoastră tehnologice!\n" " Muncitori se adună spontan şi modernizează oraşul cu căi ferate." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Aţi fondat %s" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Joc: %s a parăsit oraşul lichidat %s pentru a nu eşua." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -29651,7 +29638,7 @@ "Când %s a fost lichidat %s dumneavoastră n-a putut fugii şi ca atare a fost " "pierdut." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -29659,119 +29646,119 @@ "Când %s a fost lichidat %s dumneavoastră n-a putut fugii şi ca atare a fost " "pierdut." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Aţi distrus complet %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s a fost distrus de %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Aţi cucerit oraşul %s! %d galbeni vă cad pradă." msgstr[1] "Aţi cucerit oraşul %s! %d galbeni vă cad pradă." -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s a cucerit oraşul %s şi %d galbeni i-au căzut pradă." msgstr[1] "%s a cucerit oraşul %s şi %d galbeni i-au căzut pradă." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Aţi cucerit %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s a cucerit %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Aţi eliberat oraşul %s! Prada este de %d galbeni." msgstr[1] "Aţi eliberat oraşul %s! Prada este de %d galbeni." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s a eliberat oraşul %s şi %d galbeni i-au căzut pradă." msgstr[1] "%s a eliberat oraşul %s şi %d galbeni i-au căzut pradă." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Aţi eliberat oraşul %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s i-a eliberat pe %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "%s a anulat rutele comerciale dintre %s şi oraşul dvs. %s" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "%s a anulat rutele comerciale dintre %s şi oraşul dvs. %s" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " din planul de lucru" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s construieşte %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vinzi %s în %s (acum înconjurată de pământ) pentru %d galbeni." msgstr[1] "Vinzi %s în %s (acum înconjurată de pământ) pentru %d galbeni." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%s al %slor (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Bază aeriană" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30057,97 +30044,98 @@ msgid "The %s have started building a spaceship!" msgstr "%s au început construcţia unei nave spaţiale!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s nu poate construi încă %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Poate întemeia oraşe.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s a terminat de construit: %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "%s nu poate fi întreţinut în %s şi este vândut!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Galbeni insuficienţi. %s a fost dezmembrat." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Poluare în apropiere de oraşul %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, fuzzy, c-format msgid "Celebrations in your honor in %s." msgstr "Petrecere nebună în cinstea ta în oraşul %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Petrecerea a fost anulată în %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Dezordine publică în %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "DEZORDINEA PUBLICĂ CONTINUĂ în %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Ordinea a fost restaurată în %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Poporul a răsturnat %s dvs. Ţara se află în răzmeriţă." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s nu poate construi încă%s, pentru că nu putem părăsi singurul nostru oraş." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s a fost dizolvat pentru a obţine %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30155,7 +30143,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30163,91 +30151,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s a fost dizolvat pentru a obţine %s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s a fost bombardată nuclear de %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Poluare în apropiere de oraşul %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Foametea în %s provoacă pierderi de populaţie." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%si au distrus %s în %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "%sul dumneavoastră a distrus %s în %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Producţia de %s este modernizată în %s în %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32137,34 +32125,34 @@ msgid "Your %s was captured after completing the mission." msgstr "%sul dumneavoastră a fost prins după ce şi-a terminat misiunea." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Aţi cauzat un incident în timp ce l-aţi mituit pe al lui %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s a cauzat un incident în timp ce vă mituia %sul." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" "Aţi creat un incident în timp ce încercaţi să furaţi tehnologie de la %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "%s a fost prins în timp ce încerca să fure tehnologie de la dumneavoastră." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Aţi cauzat un incident în timp ce incitaţi la revoltă în %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s au cauzat un incident în timp ce incita o revoltă în %s." @@ -32491,19 +32479,19 @@ msgstr "" "Timpul de gândire pentru rundă este mai mic decât zero, se fixează la zero." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Suprafaţă mare - posibil să dureze câteva secunde." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Generatorul 3 nu a amplasat toate insulele mari." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Generatorul 3 a lăsat suprafaţa%li neamplasată." @@ -32690,12 +32678,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "%sul dumneavoastră a fost mutat datorită schimbării terenului." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "%s a fost dizolvat datorită modificării terenului." @@ -33397,8 +33385,8 @@ "salvări mai vechi, sau poate indica un fişier salvat invalid. Continuaţi pe " "propria dumneavoastră raspundere." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s a fost adăugat ca jucător AI de nivelul %s." @@ -36132,7 +36120,16 @@ "Starea de încetare a focului cu %s s-a terminat. Acum sunteţi în război cu " "%s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +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:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36141,133 +36138,133 @@ "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:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "opţiuni suportate: %s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Salvarea jocului ca %s a eşuat" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Jocul salvat ca %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Jocul rulează deja." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Pornesc jocul." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "cerere pentru raport necunoscut (tip %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Avertisment: refuz o versiune veche de client %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Nu puteţi modifica valoarea aceastei opţiuni." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Naţiunea %s nu este disponibilă în acest scenariu." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Naţiunea %s este deja aleasă." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s este conducătorul %s %s" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s îi conduce pe %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Se trimite informaţia la metaserver [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Jocul sa terminat ..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "Joc: Nu puteţi mitui o unitate a acestei naţiuni." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Opţiunea: %s a fost setată la \"%s\"." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Se acceptă jucători ..." @@ -38118,56 +38115,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Scopul cercetărilor este %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Aţi furat %s de la %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%si au furat %s de la dvs.!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%si au furat %s de la %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39112,6 +39109,21 @@ msgstr "eroare %d (compilat fără strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Această comandă este valabilă doar pentru client." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Această comandă este valabilă doar pentru client." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv versiunea %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s nu poate construi încă %s." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/ru.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/ru.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/ru.po freeciv-2.5.8/translations/freeciv/ru.po --- freeciv-2.5.7/translations/freeciv/ru.po 2017-05-13 12:07:59.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/ru.po 2017-08-12 11:54:44.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" -"PO-Revision-Date: 2017-05-10 09:18+0500\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-05 02:29+0500\n" "Last-Translator: Konstantin Vedeneev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -383,12 +383,12 @@ "Соблюдайте обязательства нашего славного союза — и Ваше имя никогда не будет " "забыто!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s прекратили строить Чудо %s в городе %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s приступили к строительству Чуда %s в городе %s." @@ -425,7 +425,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -575,8 +575,8 @@ "Freeciv is free software and you are welcome to distribute copies of it " "under certain conditions;" msgstr "" -"Freeciv является бесплатным продуктом и Вы имеете право распространять его " -"копии при определённых условиях;" +"Freeciv — бесплатный продукт, Вы можете распространять его копии при " +"некоторых условиях;" #: client/chatline_common.c:183 msgid "See the \"Copying\" item on the Help menu." @@ -822,13 +822,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1942,10 +1942,10 @@ msgstr "№" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Флаг" @@ -2679,7 +2679,7 @@ msgstr "Каким народом Вы будете управлять?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Выберите народ" @@ -3355,16 +3355,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Название" @@ -3474,11 +3474,11 @@ msgstr "Народы" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Тип" @@ -3649,9 +3649,9 @@ msgid "Seen (Invis)" msgstr "Просмотренные (Скрытые)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Неизвестно" @@ -3773,7 +3773,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Сообщайте об ошибках по адресу %s\n" @@ -3797,7 +3797,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Обзор" @@ -4166,12 +4166,12 @@ msgid "Load Lua Script" msgstr "Загрузить Lua-скрипт" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Основать город" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4201,8 +4201,8 @@ msgid "Set local options" msgstr "Установить локальные параметры" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Настройки игры" @@ -4576,8 +4576,8 @@ msgid "Game/Scenario Properties" msgstr "Свойства игры/сценария" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Сохранить сценарий" @@ -4936,7 +4936,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s, %s клиент" @@ -4947,7 +4947,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4958,267 +4958,260 @@ "commit: %s\n" "%s клиент" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), %s клиент" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Начать новую игру (_N)" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Начать игру по сценарию (_S)" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Загрузить сохранённую игру (_L)" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Подключиться к сетевой игре (_o)" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Подключиться к Gaming Zone (_Z)" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Выберите каталог для сохранения" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "Обзор... (_B)" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Пароль не подходит, введите верный пароль." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Имя сервера" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Порт" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Версия" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Состояние" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "Игроков" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Люди" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Комментарий" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Локальная сеть (_A)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Интернет-Метасервер (_M)" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Адрес (_H):" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "Порт (_P):" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "Логин (_L):" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "Пароль (_w):" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Подтвердите Пароль (_i):" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Адрес" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Подключиться (_o)" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Название подключения: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Имя игрока: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Адрес: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Информация об игроке/подключении" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Информация об игроке %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Изменить готовность игрока" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Выбрать народ" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Наблюдать за этим игроком" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Управлять этим игроком" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Оборвать подключение" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Сменить статус компьютерного управления" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Удалить игрока" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Дать уровень доступа %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Включить в %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Не готов (_r)" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "Готов (_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "Начать (_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "Управлять %s (_T)" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Выбрать народ (_N)" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Управлять этим игроком (_T)" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "Наблюдать за %s (_O)" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "Наблюдать (_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Прекратить наблюдение (_o)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<Компьютер (%s)>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Случайный" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Наблюдатель" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Отсоединён" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5226,95 +5219,95 @@ "Число игроков\n" "(в т.ч. комп.) (_P):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Уровень компьютерного противника (AI) (_L):" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Набор правил:" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Дополнительные параметры игры... (_M)" -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Счёт" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Рейтинг" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Готов" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Лидер" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Команда" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Выберите сохранённую игру для загрузки" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Выберите сохранённую игру для загрузки (_L):" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Выберите сценарий" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Выберите сценарий (_S):" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Имя файла:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Сохранить игру" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Сохранённые игры (_G):" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Имя файла сохранения (_F):" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Сохранённые сценарии (_n):" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Сохранить сценарий (_e):" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Сохранить карту" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Сохранённые карты (_I):" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Сохранить карты (_M):" @@ -5839,7 +5832,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Дополнительная информация доступна%sпри клике по жителям." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "Новый пароль (_w):" @@ -5876,7 +5869,7 @@ msgstr "Сменить домашний город" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Загрузить" @@ -6116,8 +6109,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6294,7 +6287,7 @@ msgstr[1] "Вы действительно хотите расформировать эти %1 соединения?" msgstr[2] "Вы действительно хотите расформировать эти %1 соединений?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6310,7 +6303,7 @@ msgid "Yes" msgstr "Да" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6397,12 +6390,12 @@ msgid "This is Qt-client for Freeciv." msgstr "Это Qt-клиент для Freeciv." -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Не наблюдать" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Наблюдать" @@ -6436,7 +6429,7 @@ "после указания '--'. Подробнее — в документации по Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Выйти?" @@ -6591,9 +6584,9 @@ msgid "Game" msgstr "Игра" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Настройки" @@ -6618,8 +6611,8 @@ msgid "Leave game" msgstr "Покинуть игру" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6878,7 +6871,7 @@ msgstr "Налоги..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "Игроки" @@ -6899,7 +6892,7 @@ #: client/gui-qt/menu.cpp:1077 client/gui-qt/menu.cpp:1096 #: client/gui-qt/menu.cpp:1124 msgid "Transform to %1" -msgstr "Преобразовать в %s" +msgstr "Преобразовать в %1" #: client/gui-qt/menu.cpp:1104 client/gui-xaw/menu.c:172 msgid "Build Farmland" @@ -6926,7 +6919,7 @@ msgid "... read more in help" msgstr "... см. больше в Справке" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Перегрузить" @@ -6936,123 +6929,117 @@ msgstr "Применить" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s, Qt-клиент" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "commit: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Клиент Qt" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), Qt-клиент" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Начать новую игру" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Начать игру по сценарию" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Загрузить сохранённую игру" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Подключиться к сетевой игре" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Подключиться" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Логин" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Пароль" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Подтвердите пароль" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "Серверы интернет:" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Локальные серверы:" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Дата" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Обзор..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Загрузить сценарий" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Лидер" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Отключиться" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Начать" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Сохранить Файлы" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "Открыть файл сохранения" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Файлы Сценариев" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Открыть файл Сценария" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Глобальные наблюдатели" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Не готово" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Установить уровень сложности" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Включить в команду" @@ -7155,7 +7142,7 @@ msgid "Back" msgstr "Назад" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Загрузить игру" @@ -8295,44 +8282,38 @@ msgstr "Добавить новый план" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "клиент %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Начать новую игру" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Присоединиться к игре" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Присоединиться к публичному серверу" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Присоединиться к серверу локальной сети" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL-клиент приветствует Вас..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Commit: %s" @@ -15565,83 +15546,83 @@ msgid "?unitflag:Hunter" msgstr "Охотник" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv версии %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(бета-версия)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv версии %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv версии %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "бета-версия " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "версия " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "январе" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "феврале" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "марте" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "апреле" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "мае" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "июне" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "июле" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "августе" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "сентябре" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "октябре" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "ноябре" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "декабре" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15651,7 +15632,7 @@ "Freeciv %s будет выпущена в %s\n" "на %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15661,7 +15642,7 @@ "Freeciv %s будет выпущена\n" "на %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Потому что цивилизация должна быть свободной!" @@ -16577,61 +16558,61 @@ "Каждый Налогосборщик за каждый ход добавляет в Вашу казну 2 дополнительных " "золотых." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Европейский" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Классический" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Тропический" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Азиатский" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Вавилонский" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Кельтский" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Эпохи Возрождения" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Индустриальный" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Современный" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Постмодернистский" @@ -18461,18 +18442,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "Рекрут" @@ -19251,14 +19232,14 @@ "в котором Вы начали строить Чудо и построить его всего за один ход!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Вождь варваров" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -21255,9 +21236,9 @@ "Исследователи, первопроходцы исследуют местность и создают карты открытых " "территорий." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21676,8 +21657,8 @@ "Каждый специалист-Налогосборщик каждый ход добавляет в Вашу казну три " "дополнительных золотых." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Эры Электричества" @@ -22135,13 +22116,18 @@ "Это Вы. Если вы потеряете это соединение, вы проиграете и игру. Так что не " "делайте этого." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "Не давать воли варварам из хижин." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "СРОН" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28757,7 +28743,7 @@ " - private project administration\n" " list (for security issues, etc)" msgstr "" -" freeciv-dev@freelists.org — публичный список рассылки\n" +" freeciv-dev@freelists.org — публичный список рассылки\n" " разработки (архивы общедоступны)\n" " freeciv-maintainers@lists.sourceforge.net —\n" " закрытый список администрирования\n" @@ -31460,19 +31446,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Неизвестна" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Не установлен" @@ -31528,11 +31514,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Установщик модпаков Freeciv (консоль)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Модпак успешно установлен" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Ошибка установки модпака: %s" @@ -31564,7 +31550,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Автоматически установить модпак из данного URL" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -31572,7 +31558,7 @@ "В данный момент идёт установка модпака.\n" "Вы действительно хотите выйти?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Другая загрузка уже запущена" @@ -31580,7 +31566,7 @@ msgid "Failed to start downloader" msgstr "Ошибка запуска программы для загрузки" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -31589,40 +31575,40 @@ "%s%s\n" "commit: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Установлен" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Тип" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Подтип" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Лицензия" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Установить модпак" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL модпака" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Выберите модпак для установки" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -31633,11 +31619,11 @@ "после указания '--'. Подробнее — в документации по Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Установщик модпаков Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Установщик модпаков Freeciv (gtk3)" @@ -31942,85 +31928,85 @@ msgid "A poorly-named city" msgstr "Плохо названный город" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Домашний город соединения %s был изменён на %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "У народа %s уже есть %s. Невозможно передать вашего." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Переведено %s в %s от %s к %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Переведено %s от %s к %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" "Соединение %2$s народа %1$s было потеряно при перемещении в город %4$s " "народа %3$s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Вы потеряли %s вместе с контролем над городом %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "" "В городе %2$s было построено здание %1$s вместо заданного устаревшего здания." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "У Вас уже был город с названием %s. Этот город был переименован в %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "Люди в городе %s потрясены Вашими технологическими достижениями!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Рабочие внезапно собираются и обновляют дороги в городе %s на %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Рабочие внезапно собираются и улучшают дороги города %s." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Рабочие внезапно собираются и улучшают базы города %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Вы основали город %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Соединение %s было перемещено из разрушенного города %s, так как оно не " "может находиться на рельефе %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." @@ -32028,7 +32014,7 @@ "Когда город %s был разрушен, соединение %s не смогло выбраться и было " "потеряно." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." @@ -32036,17 +32022,17 @@ "Когда город %s был разрушен, ваше соединение %s в городе %s оказалось в " "ловушке и было потеряно." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Вы полностью разрушили город %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Город %s был уничтожен игроком %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -32054,7 +32040,7 @@ msgstr[1] "Вы захватили город %s, добыча составила %d золотых!" msgstr[2] "Вы захватили город %s, добыча составила %d золотых!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -32062,17 +32048,17 @@ msgstr[1] "Игрок %s захватил город %s и награбил в нём %d золотых." msgstr[2] "Игрок %s захватил город %s и награбил в нём %d золотых." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Вы захватили город %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "Игрок %s захватил город %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -32080,7 +32066,7 @@ msgstr[1] "Вы освободили город %s! Сбежавшие оккупанты оставили %d золотых." msgstr[2] "Вы освободили город %s! Сбежавшие оккупанты оставили %d золотых." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -32088,59 +32074,59 @@ msgstr[1] "Игрок %s освободил город %s и взял с оккупантов %d золотых." msgstr[2] "Игрок %s освободил город %s и взял с оккупантов %d золотых." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Вы освободили город %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "Игрок %s освободил город %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" "Торговля между городами %s и %s прекращена в связи с разрушением одного из " "них." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Торговля города %s с городом %s прекращена." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" "Торговый путь, связывающий город %3$s с городом %2$s народа %1$s, утрачен " "навсегда вместе с городом." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "К сожалению, %s прекратили торговлю между %s и вашим городом %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Мы прекратили торговлю между %1$s и %3$s, городом народа %2$s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " (по плану)" # FIXME: split needed (unit/improvement or even unit/building/wonder/coinage). #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "Город %s сейчас строит %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -32148,16 +32134,16 @@ msgstr[1] "Здание %s в %s (сейчас не на побережье) продано за %d золота." msgstr[2] "Здание %s в %s (сейчас не на побережье) продано за %d золота." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Количество полей, доступных городу %s, %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "увеличилось" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "уменьшилось" @@ -32442,21 +32428,24 @@ msgid "The %s have started building a spaceship!" msgstr "%s начали строительство космического корабля!" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." -msgstr "Город %s пока ещё не может строить соединение %s." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "" +"Город %s ещё не может формировать соединение %s. (размер города: %d, пойдёт " +"на формирование: %d)" # FIXME: misleading TRANS comment. Only unit can be here. #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "В городе %s закончено формирование соединения %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -32470,57 +32459,57 @@ "Со строительством соединения %1$s размер города %3$s уменьшился на %2$d до " "%4$d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Невозможно содержать %s в %s, здание продано!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Недостаточно золота. Соединение %s расформировано." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Загрязнение возле %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "В городе %s начался праздник." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Праздник в городе %s завершён." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "Город %s поразила эпидемия! Население сократилось!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Гражданские беспорядки в городе %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "В ГОРОДЕ %s ПРОДОЛЖАЮТСЯ ГРАЖДАНСКИЕ БЕСПОРЯДКИ." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "В городе %s был восстановлен порядок." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Ваша %s свергнута, страна в хаосе." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" @@ -32528,13 +32517,13 @@ "единственный город." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "Город %s был разрушен, вместо него у нас теперь есть %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -32542,7 +32531,7 @@ "Мигранты из города %s не могут переехать в %s, так как там недостаточно еды!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -32552,7 +32541,7 @@ "недостаточно еды!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -32562,7 +32551,7 @@ "недостаточно еды!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -32571,7 +32560,7 @@ "здание, необходимое для обеспечения жильём растущего населения!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -32581,7 +32570,7 @@ "населения!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -32590,72 +32579,72 @@ "ещё не построено здание, необходимое для обеспечения жильём растущего " "населения!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "Город %s был разрушен после того как был оставлен своими жителями." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Мигранты из %s в поисках лучшей жизни переехали в город %s." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Мигранты из %s в поисках лучшей жизни переехали в %s, город народа %s." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" "Мигранты из %s, города народа %s, в поисках лучшей жизни переехали в %s." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "Бедствие: %2$s в городе %1$s!" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Радиоактивное заражение в окрестностях города %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "Бедствие %s вызвало потерю населения в городе %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "Бедствие %s уничтожило здание %s в городе %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "В городе %s бедствием были уничтожены все запасы еды." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "Строившееся в городе %2$s Чудо %1$s было разрушено." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "Жители города %s в поисках лучшей жизни подумывают о переезде в %s." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -34036,7 +34025,7 @@ #: server/connecthand.c:164 #, c-format msgid "Welcome to the %s Server running at %s port %d." -msgstr "Добро пожаловать на сервер %s работающий на %s, порт %d." +msgstr "Добро пожаловать на сервер %s на %s, порт %d." #: server/connecthand.c:168 #, c-format @@ -34649,36 +34638,36 @@ msgid "Your %s was captured after completing the mission." msgstr "Ваш %s был схвачен после выполнения своей миссии." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Вы вызвали дипломатический инцидент при подкупе %2$s народа %1$s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" "Игрок %s вызвал дипломатический инцидент при попытке подкупа вашего " "соединения %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Вы вызвали инцидент при попытке похитить технологию из %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" "Игрок %s вызвал дипломатический инцидент при попытке похитить вашу " "технологию." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Вы вызвали дипломатический инцидент при попытке взбунтовать город %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s вызвали дипломатический инцидент при попытке взбунтовать город %s." @@ -35047,20 +35036,20 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Тайм-аут хода меньше нуля, устанавливаем в 0." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Сервер не смог выбрать начальные позиции." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Большая территория — это может занять несколько секунд." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" "Генератор 3 не смог разместить достаточное количество больших островов." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -35243,12 +35232,12 @@ msgstr "" "Рабочие внезапно собираются и модернизируют базы во всех доступных городах." -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Ваше соединение %s было передвинуто в связи с изменением рельефа." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Ваше соединение %s было расформировано из-за изменения рельефа." @@ -35946,8 +35935,8 @@ "со старыми сохранёнными играми или может означать, что файл сохранения " "испорчен. Используйте на свой страх и риск." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "" @@ -38839,62 +38828,71 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Перемирие с %s закончилось. Теперь вы в состоянии войны с народом %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Перемирие между %s и %s закончилось, они снова воюют между собой. Вы " +"расторгли союз с %s." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" "Перемирие между %s и %s закончилось, они снова воюют между собой. Вы " -"отменили союз с обоими." +"расторгли союз с обоими." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" "Автоматическое размещение частей Космического корабля, которые были ещё не " "размещены." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "%d — не поддерживаемый тип сжатия." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Не удалось сохранить игру в файл %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Игра сохранена в файл %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Игра уже запущена." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "Со стартом игры пользователь %s лишился уровня доступа cmdlevel. С этих пор " "используйте голосование." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Запуск игры." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "запрошен неизвестный отчёт (тип %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Внимание: отказываем старому клиенту (%s)" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -38902,52 +38900,52 @@ "Ваш клиент устарел. Пожалуйста обновите ваш клиент до версии Freeciv 2.2 или " "выше для использования этого сервера." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Вам не разрешено редактирование." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "Народ %s недоступен для выбора пользователем." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Народ %s уже занят." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "Пользователь %s руководит народом %s под именем %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Ждём начала игры: %d из %d игроков готовы начать." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" "запрошенное количество игроков превышает значение параметра 'maxplayers'" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" "недостаточно народов для игры в выбранном наборе народов (см. параметр " "'nationset')" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "недостаточно народов для игры" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "Игрок %s руководит народом %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -38955,33 +38953,33 @@ "Этот сервер Freeciv поддерживает авторизацию пользователей, но сейчас она не " "используется." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Отправляем информацию метасерверу <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Не запускается без явного запроса соединения с метасервером." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Эта игра завершена..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "Невозможно создать подходящую карту, пробуем другое начальное зерно" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Невозможно создать подходящую карту с заданными параметрами." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Значение параметра '%s' (%s) было уточнено и изменено на %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Принимаются подключения новых клиентов на порту %d." @@ -40846,18 +40844,18 @@ msgid "%s acquire %s as a result of learning %s." msgstr "Народ %s получает технологию %s в результате изучения технологии %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" "Недостаток научных исследований привёл к потере Технологии Будущего %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Недостаток научных исследований привёл к потере технологии %s." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -40867,7 +40865,7 @@ "утеряна. Правительство в коллапсе, в стране началась революция с целью " "установления формы правления %s." -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -40877,32 +40875,32 @@ "утеряна. Жители предпочли перейти к форме правления %s." # FIXME: split unit-improvement. -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "Город %s не может строить %s. Необходимая технология была утеряна." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Технологическая цель — %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Вы украли у народа %2$s технологию %1$s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s украли у Вас технологию %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%1$s украли у народа %3$s технологию %2$s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/sr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/sr.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/sr.po freeciv-2.5.8/translations/freeciv/sr.po --- freeciv-2.5.7/translations/freeciv/sr.po 2017-05-13 12:07:59.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/sr.po 2017-08-12 11:54:44.000000000 +0000 @@ -50,7 +50,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Goran Rakic \n" "Language-Team: Serbian (sr) \n" @@ -412,12 +412,12 @@ "*%s (рач.)* %s нас крвнички нападоше и молимо те за помоћ! Одужи се нашем " "часном савезу и твоје име никада неће бити заборављено!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "У држави %s обуставише да граде %s у месту %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "У држави %s граде %s у месту %s." @@ -451,7 +451,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -854,13 +854,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1948,10 +1948,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Застава" @@ -2701,7 +2701,7 @@ msgstr "Који народ желиш да будеш?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Одабери народ" @@ -3367,16 +3367,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Име" @@ -3490,11 +3490,11 @@ msgstr "Народи" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Врста" @@ -3666,9 +3666,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Непознато" @@ -3787,7 +3787,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Грешке пријавите на %s\n" @@ -3811,7 +3811,7 @@ msgstr "Shift и Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Поглед" @@ -4183,12 +4183,12 @@ msgid "Load Lua Script" msgstr "_Укрцај јединицу" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Оснуј нови град" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4219,8 +4219,8 @@ msgid "Set local options" msgstr "Постави локалне поставке" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Поставке игре" @@ -4609,8 +4609,8 @@ msgid "Game/Scenario Properties" msgstr "Особине игре и приче" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Сачувај причу" @@ -4978,7 +4978,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "" @@ -4989,7 +4989,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4997,372 +4997,365 @@ "%s client" msgstr "Фрицив издање %s %s" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Фрицив издање %s %s" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Започни игру" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "_Покрени причу" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Учитај сачувану игру" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Приступи _мрежној игри" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Повежи се на Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Одабери одредиште за чување" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Разгледај..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Лозинке се не поклапају, унеси нову." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Сервер" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Порт" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Издање" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Стање" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Играча" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "човек" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Коментар" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Локална мрежа" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Интернтет _метасервер" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Домаћин:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Порт:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Корисник:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Лозинка:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_Потврди лозинку:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "При_јава" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Назив везе: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Име играча: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Домаћин: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Подаци играча и везе" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "Подаци за %s" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Промени спремност" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Изабери народ" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Посматрај играча" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Преузми играча" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Пресеци везу" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Рачунарско управљање" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Уклони играча" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Омогући приступ подацима" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Сврстај у %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Није _спреман" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Спреман" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Започни" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Одабери _народ" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Преузми играча" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Посматрач: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Посматрај" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Не _посматрај" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "<рач. лагани>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Насумице" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Посматрач" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "Број _играча (укључујући рачунарске):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "_Мудрост рачунарских:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Ослободи управљања" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Додатне поставке игре..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Снимање" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Оцена" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Спреман" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "Име" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Лига" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Одабери сачувану игру за учитавање" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Одабери сачувану игру за _учитавање:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Одабери причу" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Одабери _причу:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "Име сачуване игре:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Сачувај игру" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Сачуване _игре:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Име сачуване игре:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "Сачувај причу" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "Сачувај причу" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Сачувај игру" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Сачуване _игре:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Сачуване _игре:" @@ -5910,7 +5903,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Лозинка:" @@ -5951,7 +5944,7 @@ msgstr "Прогласи за родни град" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Укрцај" @@ -6232,8 +6225,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6422,7 +6415,7 @@ msgstr[2] "Сигурно желиш да изађеш?" msgstr[3] "Сигурно желиш да изађеш?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6438,7 +6431,7 @@ msgid "Yes" msgstr "Да" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6529,13 +6522,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Добродошли у Фрицив" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Не _посматрај" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Посматрај" @@ -6569,7 +6562,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "_Напусти програм" @@ -6748,9 +6741,9 @@ msgid "Game" msgstr "Игра" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "" @@ -6779,8 +6772,8 @@ msgid "Leave game" msgstr "Сачувај игру" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -7065,7 +7058,7 @@ msgstr "Расподела буџета" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7118,7 +7111,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Освежи" @@ -7129,143 +7122,137 @@ msgstr "Примени једном" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Фрицив издање %s %s" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Јединице: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Фрицив издање %s %s" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s у држави %s (%s)" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Започни игру" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "_Покрени причу" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "_Учитај сачувану игру" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Приступи _мрежној игри" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Повежи се" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "_Корисник:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "_Лозинка:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_Потврди лозинку:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Интернтет _метасервер" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Посматрач" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Разгледај..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "Сачувај причу" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "_Вођа:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Прекини везу" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Започни" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Играча" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Име сачуване игре:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "_Покрени причу" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "_Покрени причу" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Посматрач" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Није _спреман" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", ниво тежине %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Сврстај у %s" @@ -7377,7 +7364,7 @@ msgid "Back" msgstr "Назад" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Учитај игру" @@ -8521,44 +8508,38 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Фрицив" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Фрицив издање %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Фрицив издање %s %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Започни игру" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Град: %s" @@ -15321,83 +15302,83 @@ msgid "?unitflag:Hunter" msgstr "хеликоптер" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Фрицив издање %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(бета издање)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Фрицив издање %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Фрицив издање %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "бета издање за тестирање " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "издање " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "јануару" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "фебруару" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "марту" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "априлу" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "мају" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "јуну" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "јулу" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "августу" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "септембру" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "октобру" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "новембру" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "децембру" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15407,7 +15388,7 @@ "Издање Фрицив %s ће бити спремно у\n" "%s за преузимање са %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15417,7 +15398,7 @@ "Издање Фрицив %s ће бити спремно у\n" "%s за преузимање са %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Јер дух цивилизације мора бити слободан!" @@ -16198,61 +16179,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "европски" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "класични" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "тропски" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "азијски" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "вавилонски" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "келтски" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "ренесансни" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "индустријски" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "савремени" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "футуристички" @@ -17937,18 +17918,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "новајлија" @@ -18571,14 +18552,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "вођа варвара" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20250,9 +20231,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -20599,8 +20580,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "келтски" @@ -20987,13 +20968,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "авакс" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -27660,20 +27646,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Непознато" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -27728,12 +27714,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Одабери народ" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s се успешно пребаци." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -27765,14 +27751,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Сигурно желиш да изађеш?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -27780,61 +27766,61 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 #, fuzzy msgid "License" msgstr "легија" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Одабери народ" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Одабери народ" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Одабери народ" @@ -28113,107 +28099,107 @@ msgid "A poorly-named city" msgstr "Лоше име за град" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Нови родни град за јединицу %s је %s" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Пребачена јединица %s у држави %s из места %s у %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Пребачена јединица %s из места %s у %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s нестаде при премештају у %s град %s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Јединица %s оде скупа са градом %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "%s се поново изгради у месту %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Већ постоји место %s. Име града је промењено у %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Народ у месту %s је одушевљен нашим научним сазнањима!\n" " Радници су се спонтано скупили и изградили пругу у граду." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Основано је место %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Премештена јединица %s из расељеног места %s пошто на пољу %s не може остати." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" "Када је место %s расељено, %s не могаше да се извуче те се изгуби и пропаде." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" "Када је место %s расељено, %s не могаше да се извуче те се изгуби и пропаде." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Место %s је сравњено са земљом." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "Град %s сравнила је војска коју предводи %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -28222,7 +28208,7 @@ msgstr[2] "" msgstr[3] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -28231,17 +28217,17 @@ msgstr[2] "" msgstr[3] "" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Освојисмо %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "Народ %s освоји место %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -28250,7 +28236,7 @@ msgstr[2] "" msgstr[3] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -28259,54 +28245,54 @@ msgstr[2] "" msgstr[3] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Ослободили смо место %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "Народ %s ослободише место %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Пребачена јединица %s у %s из места %s у место %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " по листи задатака" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "Сада се прави %2$s у месту %1$s%3$s" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -28315,16 +28301,16 @@ msgstr[2] "Продаде се %s у месту %s (сада на копну) за %d зл." msgstr[3] "Продаде се %s у месту %s (сада на копну) за %d зл." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Величина карте места %s је %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "увећана" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "смањена" @@ -28603,20 +28589,21 @@ msgid "The %s have started building a spaceship!" msgstr "" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "У месту %s заврши се %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -28625,76 +28612,76 @@ msgstr[2] "" msgstr[3] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Загађење недалеко од места %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Завршена прослава „Живеће наш %s“ у месту %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Грађански немири у месту %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "ГРАЂАНСКИ НЕМИРИ СЕ НАСТАВЉАЈУ у месут %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Ред је успостављен у месту %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "%s је пала, дух преврата обавија земљу." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -28702,7 +28689,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -28710,91 +28697,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "Војска %2$s бацила је атомску бомбу на место %1$s." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "Војска %2$s бацила је атомску бомбу на место %1$s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Загађење недалеко од места %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Глад узима данак, %s има све мање становника." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "(сравњено)" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Ред је успостављен у месту %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%s у изградњи постаде %s у месту %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -30448,32 +30435,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "Народ %s заврши %s у месту %s." @@ -30792,19 +30779,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -30976,12 +30963,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -31660,8 +31647,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "Играч %s придружен као рачунарски противник, ниво %s." @@ -33980,7 +33967,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Прекид ватре које ти и %s потписасте истече. У рату смо са народом %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Прекид ватре које потписаше %s и %s истече. Они су сада у рату. Савез са " +"њима је раскинут." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -33989,130 +33985,130 @@ "Прекид ватре које потписаше %s и %s истече. Они су сада у рату. Савез са " "њима је раскинут." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Не могу да сачувам игру под именом „%s“" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Игра сачувана под именом „%s“" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Игра је већ у току." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Покрећем игру." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Упозорење: Застарели клијент %s је одбијен." -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Нажалост, на овом серверу гостима приступ није дозвољен." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s је %s вођа %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s, вођа %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Сачувана игра: „%s“ постављено на %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -35903,56 +35899,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -36866,6 +36862,18 @@ msgid "error %d (compiled without strerror)" msgstr "" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Фрицив издање %s %s" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s у држави %s (%s)" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Фрицив издање %s (%s)" + #~ msgid "Ruleset _Version:" #~ msgstr "Скуп _правила:" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/sv.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/sv.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/sv.po freeciv-2.5.8/translations/freeciv/sv.po --- freeciv-2.5.7/translations/freeciv/sv.po 2017-05-13 12:08:00.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/sv.po 2017-08-12 11:54:45.000000000 +0000 @@ -56,7 +56,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2010-06-20 19:43+0200\n" "Last-Translator: Jon Severinsson \n" "Language-Team: Swedish \n" @@ -406,12 +406,12 @@ "*%s (datorstyrd)* Jag har blivit brutalt överfallen av %s och är i behov av " "hjälp! Hedra vårt förbund och er hjälpsamhet kommer inte gå förbi obemärkt!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s har avbrutit bygget av %s i %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s har börjat bygga %s i %s." @@ -446,7 +446,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -851,13 +851,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1956,10 +1956,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Flagga" @@ -2680,7 +2680,7 @@ msgstr "Vilket folk ska du styra?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Välj folkslag" @@ -3335,16 +3335,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Namn" @@ -3456,11 +3456,11 @@ msgstr "Folkslag" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Typ" @@ -3617,9 +3617,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Okänd" @@ -3741,7 +3741,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Anmäl buggar på %s\n" @@ -3765,7 +3765,7 @@ msgstr "Skift+Retur" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4144,12 +4144,12 @@ msgid "Load Lua Script" msgstr "Lasta på" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Grunda stad" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4182,8 +4182,8 @@ msgid "Set local options" msgstr "Ställ in lokala tillval" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Spelinställningar" @@ -4569,8 +4569,8 @@ msgid "Game/Scenario Properties" msgstr "Spel-/Scenario_tilval" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "_Spara Scenario" @@ -4938,7 +4938,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Detta kommando kan endast utföras i klienten." @@ -4949,7 +4949,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4957,373 +4957,366 @@ "%s client" msgstr "Detta kommando kan endast utföras i klienten." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Detta kommando kan endast utföras i klienten." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Påbörja _nytt spel" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Påbörja _scenariospel" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Återuppta sparat spel" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "_Anslut till nätverksspel" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Delta i nätverksspel (Gaming _Zone)" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Välj plats att spara till" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Bläddra..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Lösenorden är olika, ange lösenord." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Servernamn" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Version" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Status" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Spelare" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "Mänsklig" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Anmärkning" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Lokalt _nätverk" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Värd:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Logga in som:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "L_ösenord:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "_Bekräfta lösenord:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Värd" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "An_slut" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Anslutningsnamn: %s." -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Spelarnamn: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Värd: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Spelar/anslutn. info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Växla redoläge för spelare" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Välj folkslag" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Iakttag spelareen" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Ta spelaren" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Bryt anslutningen" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Slå av/på datorstyrning" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Avlägsna spelaren" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Ge info access" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Gör till medlem i %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Inte _redo" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Redo" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Sätt igång" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Ta spelaren" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Välj ditt _folk" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Ta spelaren" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Iakttagare: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "_Iakttag" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "_Iakttag ej" # Svårt det här, AI används ju här som substantiv, medan den vanliga översättningen är ett adjektiv... #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s-datorstyrning>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Slumpvald" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Iakttagare" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Frånkopplad" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "A_ntal spelare (inklusive datorstyrda):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Datorspe_larens färdighetsnivå" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "öken" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "_Fler spelinställningar..." # ? FIXME -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Rekord" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Grad" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Redo" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "Namn" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Lag" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Välj sparat spel att läsa in" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Välj sparat spel att _läsa in:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Öppna scenario" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Öppna _scenario:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Filnamn:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Spara spel" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Sparade spel:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Filnamn:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "_Spara Scenario" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "_Spara Scenario" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Spara spel" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Sparade spel:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Sparade spel:" @@ -5862,7 +5855,7 @@ "Ytterligare information är tillgänglig\n" " genom att vänsterklicka på medborgarna." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "L_ösenord:" @@ -5903,7 +5896,7 @@ msgstr "Gör till ny hemstad" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "_Lasta på" @@ -6179,8 +6172,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6369,7 +6362,7 @@ msgstr[0] "Vill du verkligen avsluta?" msgstr[1] "Vill du verkligen avsluta?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6385,7 +6378,7 @@ msgid "Yes" msgstr "Ja" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6473,13 +6466,13 @@ msgid "This is Qt-client for Freeciv." msgstr "SDL-klient till Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "_Iakttag ej" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "_Iakttag" @@ -6513,7 +6506,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Avsluta" @@ -6684,9 +6677,9 @@ msgid "Game" msgstr "Spel" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Tillval" @@ -6715,8 +6708,8 @@ msgid "Leave game" msgstr "Hoppa av" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6994,7 +6987,7 @@ msgstr "Skattesatser..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7046,7 +7039,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Uppdatera" @@ -7057,143 +7050,137 @@ msgstr "Använd en gång" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Detta kommando kan endast utföras i klienten." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Trupp: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Detta kommando kan endast utföras i klienten." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Detta kommando kan endast utföras i klienten." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Påbörja nytt spel" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "Påbörja _scenariospel" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Återuppta sparat spel" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "_Anslut till nätverksspel" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Anslut" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Logga in som:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Lösenord:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "_Bekräfta lösenord:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Globala iakttagare" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Bläddra..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "_Spara Scenario" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Ledare:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Koppla från" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Sätt igång" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Filnamn:" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "Filnamn:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "Scenarionamn" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "Scenarionamn" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Globala iakttagare" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Inte _redo" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", skicklighetsläge %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "Gör till medlem i %s" @@ -7305,7 +7292,7 @@ msgid "Back" msgstr "Bakåt" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Öppna sparat spel" @@ -8452,44 +8439,38 @@ msgstr "Lägg till arbetslista" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv version %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Detta kommando kan endast utföras i klienten." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Påbörja nytt spel" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Delta i spel" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Delta i spel online" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Delta i lokalt spel" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL-klienten önskar dig välkommen..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Stad: %s" @@ -15374,83 +15355,83 @@ msgid "?unitflag:Hunter" msgstr "helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv version %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(betaversion)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv version %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv version %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "betatestversion " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "version " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "januari" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "februari" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "mars" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "april" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "maj" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "juni" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "juli" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "augusti" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "september" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "oktober" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "november" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "december" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15460,7 +15441,7 @@ "Freeciv %s kommer att ges ut i\n" "%s, på %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15470,7 +15451,7 @@ "Freeciv %s kommer att ges ut i\n" "%s, på %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Ty civilization bör vara fritt!" @@ -16364,61 +16345,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "europeisk" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "klassisk" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "tropisk" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "orientalisk" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "babylonsk" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "keltisk" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "renässans" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "industriell" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "senmodern" @@ -18228,18 +18209,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "oerfaren" @@ -18924,14 +18905,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "barbarhövding" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20852,9 +20833,9 @@ "Upptäcksresanden är modiga individer som är mycket användbara för att " "kartlägga okända områden." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21272,8 +21253,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "elektifierad" @@ -21692,13 +21673,19 @@ msgstr "" "Detta är du. Besegras denna trupp förlorar du spelet. Försök undvika det." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Endast barbarer kan bygga detta.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29555,20 +29542,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Okänd" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29623,12 +29610,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Välj en teknologi att stjäla" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "Frakten av %s genomfördes utan komplikationer." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29660,14 +29647,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Vill du verkligen avsluta?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29676,60 +29663,60 @@ msgid "Failed to start downloader" msgstr "%s misslyckades med att ansluta till någon spelare." -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Välj en teknologi att stjäla" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Välj en teknologi att stjäla" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Välj en teknologi att stjäla" @@ -30010,208 +29997,208 @@ msgid "A poorly-named city" msgstr "En dåligt namngiven stad" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Ändrade hemstad för %s till %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Överförde %s till %s från %s till %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Överförde %s från %s till %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "Vi förlorade %s %s under överföring till %s %s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "Vi förlorade %s tillsammans med staden %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "En ny byggnad av typen %s har byggts i %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Vi hade redan en stad med namnet %s. Stadsnamnet ändrades till %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "Folket i %s förundras över vår teknologiska insikt!\n" " Arbetare samlas frivilligt och bygger järnväg genom staden." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Vi grundade %s." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Flyttar ut %s ur den upplösta staden %s då truppen inte kan befinna sig på " "%s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "När %s upplöstes kunde inte vår %s undkomma och gick förlorad." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "När %s upplöstes kunde inte vår %s undkomma och gick förlorad." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Vi jämnade %s med marken." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s har jämnats med marken av %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "Vi erövrade %s och plundrade %d guld!" msgstr[1] "Vi erövrade %s och plundrade %d guld!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s erövrade %s och plundrade %d guld från staden." msgstr[1] "%s erövrade %s och plundrade %d guld från staden." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "Vi erövrade %s" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s erövrade %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "Vi befriade %s och plundrade %d guld." msgstr[1] "Vi befriade %s och plundrade %d guld." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s befriade %s och plundrade %d guld från staden." msgstr[1] "%s befriade %s och plundrade %d guld från staden." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Vi har befriat %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s befriade %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "%s har tyvärr sagt upp handelsleden från %s till din stad %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "%s har tyvärr sagt upp handelsleden från %s till din stad %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " från arbetslistan" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s bygger %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "Vi sålde %s i %s (nu omgiven av land) för %d guld." msgstr[1] "Vi sålde %s i %s (nu omgiven av land) för %d guld." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "Ändrade hemstad för %s till %s." -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Flygbas" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30494,96 +30481,97 @@ msgid "The %s have started building a spaceship!" msgstr "%s har börjat bygga ett rymdskepp!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s kan inte bygga %s än." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Kan grunda nya städer.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s har färdigställt %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" msgstr[1] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Vi har inte råd att underhålla %s i %s, byggnaden såld!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Otillräckligt med guld. %s upplöst" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Utsläpp i närheten av %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Folket i %s firar i din ära." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Folket i %s har slutat fira." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s har drabbats av pest! Orsakar befolkningsminskning!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Upplopp i %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "UPPLOPPEN i %s FORTSÄTTER." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Friden i %s är återställd." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Folket har störtat vår %s. Riket är i kaos." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s kan inte färdigställa %s än: Vi kan inte överge vår enda stad." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s upplöstes till %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30591,7 +30579,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30599,91 +30587,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s atombombades av %s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "Utsläpp i närheten av %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "Hungersnöd orsakade befolkningsminskning i %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s förstörde %s i %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "Vår %s förstörde %s i %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "Byggandet av %s ersätts med %s i %s." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32586,32 +32574,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Vår %s tillfångatogs efter att ha utfört sitt uppdrag." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Vi har orsakat en incident vid mutandet av den %s truppen %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s har orsakat en incident när de försökte muta vår trupp %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Vi har orsakat en incident när vi försökte stjäla teknologi från %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s har orsakat en incident när de försökte stjäla teknologi från oss." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Vi har orsakat en incident genom att anstifta ett uppror i %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s har orsakat en incident genom att anstifta ett uppror i %s." @@ -32965,19 +32953,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Omgångstidsgränsen är mindre än noll. Låser den vid noll." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Hög landmassa - detta kan ta några sekunder." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Skapare 3 satte inte ut alla stora öar." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Skapare 3 lämnade %li landmassa outsatt." @@ -33156,12 +33144,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Vår %s har flyttats på grund av landskapsförändringar." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Vår %s har upplösts på grund av landskapsförändringar." @@ -33844,8 +33832,8 @@ "Det sparade spelet innehåller ofullständig kartdata. Detta kan inträffa med " "gamla sparade spel eller tyda på ogiltiga spelfiler. Fortsätt på egen risk." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s har lagts till som en datorstyrd spelare med färdighetsnivå %s." @@ -36512,7 +36500,16 @@ msgstr "" "Vapenstilleståndet med %s har upphört. Vi befinner oss nu i krig med %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +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:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -36521,51 +36518,51 @@ "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:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "Stöder inte komprimeringstyp %d" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Misslyckades med att spara spel som %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Spelet har sparats som ”%s”." -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Spelet pågår redan." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, 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:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Sätter i gång spelet." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "Okänd redogörelse efterfrågades (slag %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Varning: avvisar gammal klient %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -36573,49 +36570,49 @@ "Din klient är för gammal. Uppgradera den till Freeciv 2.2 eller senare för " "att använda denna server." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "" -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Folkslaget %s är inte tillgängligt i scenariot." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Folkslaget %s är upptaget." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%1$s styr %3$s (%2$s)." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s regerar %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 #, fuzzy msgid "" "This freeciv-server program has player authentication support, but it's " @@ -36624,35 +36621,35 @@ "Detta civserverprogram har stöd för spelarautentisering, men den är f.n. " "inte aktiverad." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Skickar information till metaservern <%s>" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Spelet är slut..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "" "Kan inte skapa trupper på %s då det angivna trupptypsid %d är ogiltigt." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Tillval: %s har satts till ”%s”." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Godtar nu nya klientanslutningar." @@ -38493,56 +38490,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Ökar forskningen i en stad med 50%." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Forskningsmålet är %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Vi stal %s från %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s stal %s från oss!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s stal %s från %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -39461,6 +39458,21 @@ msgstr "fel %d (kompilerad utan strerror)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Detta kommando kan endast utföras i klienten." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Detta kommando kan endast utföras i klienten." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv version %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s kan inte bygga %s än." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/tr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/tr.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/tr.po freeciv-2.5.8/translations/freeciv/tr.po --- freeciv-2.5.7/translations/freeciv/tr.po 2017-05-13 12:08:00.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/tr.po 2017-08-12 11:54:45.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-06-01 16:36+0300\n" "Last-Translator: Uğur Çetin \n" "Language-Team: Turkish \n" @@ -319,12 +319,12 @@ "*%s (YZ)* %s bize arkadan vurdular! Yardıma ihtiyacımız var. Yardım edersen, " "birlikteliğimizi onurlandıracaksın ve seni asla unutmayacağız!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s %s yapımını %s şehrinde durdurdular." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s %s yapımına %s şehrinde başladılar." @@ -356,7 +356,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -752,13 +752,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1864,10 +1864,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Bayrak" @@ -2595,7 +2595,7 @@ msgstr "Hangi Ulusu Yöneteceksiniz?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Ulus Seçimi" @@ -3244,16 +3244,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Ad" @@ -3376,11 +3376,11 @@ msgstr "Uluslar" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Tür" @@ -3555,9 +3555,9 @@ msgid "Seen (Invis)" msgstr "Birim(ler)i seç" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Bilinmeyen" @@ -3679,7 +3679,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Hataları %s adresine bildiriniz\n" @@ -3703,7 +3703,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4083,12 +4083,12 @@ msgid "Load Lua Script" msgstr "_Araca bindir" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Yeni Şehir İnşa Et" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4120,8 +4120,8 @@ msgid "Set local options" msgstr "Yerel seçenekleri ayarla" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Oyun Ayarları" @@ -4531,8 +4531,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "_Senaryo Oyunu Başlat" @@ -4926,7 +4926,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "Bu komut sadece istemci tarafında verilebilir." @@ -4937,7 +4937,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4945,372 +4945,365 @@ "%s client" msgstr "Bu komut sadece istemci tarafında verilebilir." -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "Bu komut sadece istemci tarafında verilebilir." - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "_Yeni Oyun Başlat" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "_Kayıtlı Oyunu Yükle" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Ağ Oyununa Katıl" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Bir Oyun Sitesine Katıl" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Kaydedilecek Yeri Seç" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "_Gözat..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Parolalar uyuşmuyor, parolanızı girin." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Sunucu Adı" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Port" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Sürüm" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Durum" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "Oyuncular" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "İnsan" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Yorum" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "_Yerel Ağ (LAN)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Internet _Metaserver" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "_Host:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "_Port:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Giriş" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Parola:" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Parolayı _Doğrula:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Sunucu" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "_Bağlan" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Bağlantı Adı: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Oyuncu Adı: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Host: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Ounucu/bağ. info" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s info" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Oyuncu hazır/hayır değil değiştirir" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Ulus seçimi" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Bu oyuncu izle" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Bu oyuncu al" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Bağlantıyı kes" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Oyuncuyu YZ yap/yapma" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Oyuncuyu sil" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr "Bilgi erişimi ver" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "%s takımına ekle" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Hazır _Değil" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "_Hazır" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "_Başlat" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr "Bu oyuncu al" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Ulus _Seç" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "Bu oyuncu al" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Seyirci: %s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "İ_zle" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "İ_zleme" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Rastgele" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Gözleyici" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Serbest" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "_Oyuncu Sayısı (YZ dahil):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "YZ Beceri _Derecesi:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "Çöl" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Diğ_er Oyun Ayarları..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Rekor" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Sıralama" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Hazır" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "İsim" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Takım" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Kayıtlı Oyunu Seç" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Kayıtlı Oyunu _Seç:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Senaryo Seç" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Senaryo _Seç:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "_Dosya Adı:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Oyunu Kaydet" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Kayıtlı _Oyunları:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "_Dosya Adı:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Oyunu Kaydet" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Kayıtlı _Oyunları:" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Kayıtlı _Oyunları:" @@ -5847,7 +5840,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "_Parola:" @@ -5887,7 +5880,7 @@ msgstr "Memleketi Yap" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Bindir" @@ -6160,8 +6153,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6349,7 +6342,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "Çıkmak istediğinizden emin misiniz?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6365,7 +6358,7 @@ msgid "Yes" msgstr "Evet" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6452,13 +6445,13 @@ msgid "This is Qt-client for Freeciv." msgstr "Freeciv'e Hoş Geldiniz" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "İ_zleme" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "İ_zle" @@ -6492,7 +6485,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "Çık" @@ -6657,9 +6650,9 @@ msgid "Game" msgstr "Oyun" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Tercihler" @@ -6688,8 +6681,8 @@ msgid "Leave game" msgstr "Oyunu Terket" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6977,7 +6970,7 @@ msgstr "Vergi Oranları" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7030,7 +7023,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Güncelle" @@ -7041,143 +7034,137 @@ msgstr "Bir kere uygula" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "Bu komut sadece istemci tarafında verilebilir." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "Birimler" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "Bu komut sadece istemci tarafında verilebilir." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "Bu komut sadece istemci tarafında verilebilir." - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "Yeni Oyuna Başlat" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "Kayıtlı Oyun Aç" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "Ağ Oyununa Katıl" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "Bağlan" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "Giriş:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "Parola:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "Parolayı _Doğrula:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Internet _Metaserver" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Gözleyici" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "_Gözat..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "Önder:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Başlantı Kaes" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Başlat" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "Bu oyuncu al" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "_Dosya Adı:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "_Senaryo Oyunu Başlat" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Gözleyici" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "Hazır _Değil" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr ", zorluluk derecesi %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "%s takımına ekle" @@ -7289,7 +7276,7 @@ msgid "Back" msgstr "Geri" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Oyun Aç" @@ -8432,44 +8419,38 @@ msgstr "Yeni iş listesi ekle" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv sürüm %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "Bu komut sadece istemci tarafında verilebilir." -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Yeni Oyuna Başlat" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Oyuna Katıl" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Halka Açık Sunucuya Katıl" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Yerel (LAN) Sunucuya Katıl" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL İstemciye hoş geldiniz..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "Şehir: %s (%s)" @@ -15227,83 +15208,83 @@ msgid "?unitflag:Hunter" msgstr "Helikopter" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv sürüm %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(beta sürümü)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv sürüm %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv Sürüm %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "betatest sürümü " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "sürüm " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Ocak" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Şubat" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Mart" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Nisan" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Mayıs" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Haziran" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Temmuz" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Ağustos" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Eylül" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Ekim" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Kasım" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Aralık" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15312,7 +15293,7 @@ "BU BİR BETA SÜRÜMÜDÜR\n" "Freeciv %s çıkış tarihi: %s, adres: %s" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15321,7 +15302,7 @@ "BU BİR BETA SÜRÜMÜDÜR\n" "Freeciv %s çıkış tarihi: %s, adres: %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Çünkü uygarlık özgür olmalıdır!" @@ -16202,61 +16183,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Avrupa tarzı" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Klasik" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Tropik" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Asya tarzı" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Babil tarzı" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Kelt tarzı" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Rönesans" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Endüstriyel" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Modern" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Post Modern" @@ -18006,18 +17987,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "acemi" @@ -18704,14 +18685,14 @@ "bir turda bitirebilirsiniz." #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Barbar Lideri" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20579,9 +20560,9 @@ "territory." msgstr "Kâşifler bilinmeyen bölgeleri keşfetmede oldukça kullanışlıdırlar." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -20980,8 +20961,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "Kelt tarzı" @@ -21409,13 +21390,19 @@ "Bu sizsiniz. Bu birimi kaybederseniz oyunu da kaybedersiniz. Yani kendinize " "dikkat edin." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Sadece paraşütçü birimler bunu yapabilir." + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "AWACS" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -29099,20 +29086,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "Bilinmeyen" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -29167,12 +29154,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Çalınacak Teknolojiyi Seç" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s başarıyla taşındı." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -29204,14 +29191,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "Çıkmak istediğinizden emin misiniz?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -29220,60 +29207,60 @@ msgid "Failed to start downloader" msgstr "Yeni YZ oyuncusu oluşturulurken hata: %s" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "Çalınacak Teknolojiyi Seç" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "Çalınacak Teknolojiyi Seç" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "Çalınacak Teknolojiyi Seç" @@ -29555,201 +29542,201 @@ msgid "A poorly-named city" msgstr "Böyle şehir adı olmaz" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "%s artık %s memleketinden." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "%2$s şehrindeki %1$s, %3$s tarafından %4$s tarafına aktarıldı." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "%s, %s sahipliğinden %s sahipliğine aktarıldı." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s birimi, %s %s şehrine aktarılırken kaybedildi" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s, %s şehrinin kontrolüyle birlikte kayboldu." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "%2$s şehrinde, yeni bir %1$s yapıldı." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Zaten %s adında bir şehriniz var. Şehrin adı %s olarak değiştirildi." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "%s şehrindeki insanlar teknolojinize hayran kaldı!\n" " İşçiler hemen toplanıp şehir içinde ray inşa etti." -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "%s şehrini kurdunuz." -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "%s, %s üzerinde duramadığı için, terk edilen %s şehrinden taşındı." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "%s şehri terk edildiğinde %s gidecek yer bulamadı ve kaybedildi." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "%s şehri terk edildiğinde %s gidecek yer bulamadı ve kaybedildi." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "%s şehrini yerle bir ettiniz." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%2$s, %1$s şehrini yerle bir etti." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "%s şehrini fethettiniz; ganimet olarak %d altın topladınız!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s, %s şehrini fethetti ve ganimet olarak %d altın topladı." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr "%s şehrini fethettiniz." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s, %s şehrini fethetti." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "%s şehrini serbest bıraktınız! Ganimet olarak %d altın topladınız." -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s, %s şehrini serbest bıraktı ve ganimet olarak %d altın topladı." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "%s şehrini serbest bıraktınız!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s, %s şehrini serbest bıraktı." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Üzgünüm, %s, %s şehrinden %s şehrinize olan ticaret yolunu iptal etti." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Üzgünüm, %s, %s şehrinden %s şehrinize olan ticaret yolunu iptal etti." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "iş listesinden " #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%1$s şehri %3$s%2$s inşa ediyor." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "%2$s şehrindeki (karaya oturan) %1$s, %3$d altına satıldı." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%s yönetimindeki %s (%s)" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "Hava üssü" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -30034,95 +30021,96 @@ msgid "The %s have started building a spaceship!" msgstr "%s uzay gemisi yapmaya başladı!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s şu anda %s inşa edemez." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Yeni şehir kurabilir.\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s şehrindeki %s inşası bitti." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "%s için %s şehrinde bakım yapılamıyor, yapı satıldı!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "Altın yetersiz. %s terhis edildi" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "%s civarında kirlilik görüldü." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "%s şehrinde sizin onurunuza kutlama yapıldı." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "%s şehrindeki kutlama iptal edildi." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "%s şehrinde ayaklanma oldu." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "%s ŞEHRİNDEKİ AYAKLANMA DEVAM EDİYOR!" -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%s şehrindeki ayaklanma bastırıldı." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "İnsanlar %s yönetiminizi devirdi, fetret dönemine girdik." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s henüz %s yapamıyor, ve elimizde kalan tek şehri terkedemeyiz." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s şehri terkedildi ve %s oluştu." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -30130,7 +30118,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -30138,91 +30126,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s şehri terkedildi ve %s oluştu." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s, %s tarafından bombalandı." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "%s civarında kirlilik görüldü." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "%s şehrinde kıtlık yüzünden nüfus azaldı." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%1$s, %3$s şehrindeki %2$s yapısını yıktı." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr "%1$s biriminiz, %3$s şehrindeki %2$s yapısını yıktı." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%s üretimi %s olarak yükseltildi (%s şehrinde)." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -32088,32 +32076,32 @@ msgid "Your %s was captured after completing the mission." msgstr "%s biriminiz görevi bitirdikten sonra yakalandı." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "%s %s birimine rüşvet verilirken bir skandala sebep oldunuz." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s, %s biriminize rüşvet verirken bir skandal yaşandı." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "%s tarafından bir teknoloji çalarken skandala sebep oldunuz." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s, sizden bir teknoloji çalarken skandala sebep oldular." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "%s şehrinde ayaklanma başlatırken bir skandala sebep oldunuz." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s, %s şehrinde ayaklanma başlatırken bir skandala sebep oldular." @@ -32437,19 +32425,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Sıra zaman aşımı sıfırdan düşük, sıfır yapılıyor." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Yüksek kara parçası - bu birkaç saniye alabilir." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 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:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Üretici 3 %li kara parçasını yapamadı." @@ -32621,12 +32609,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "%s, bulunduğu arazinin türü değiştiği için taşındı." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "%s, bulunduğu arazinin türü değiştiği için terhis edildi." @@ -33309,8 +33297,8 @@ "oyunlar, veya geçersiz kayıt edilmiş oyun sebebiyle olabilir. Riski göze " "alma sorumluluğu size aittir." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s, %s seviyesinde YZ kontrolündeki oyuncu olarak eklendi." @@ -35929,7 +35917,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "%s ile olan ateşkesin süresi doldu. Artık %s ile savaştasınız." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"%s ve %s arasındaki ateşkes bitti. Artık savaştalar. İkisiyle olan " +"ittifakınız iptal edildi." + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -35938,131 +35935,131 @@ "%s ve %s arasındaki ateşkes bitti. Artık savaştalar. İkisiyle olan " "ittifakınız iptal edildi." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Oyun %s olarak kaydedilemedi" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Oyun %s olarak kaydedildi" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Oyun zaten başladı." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Oyun başlıyor." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Uyarı: eski istemci %s reddedildi" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "Bu ayarı değiştirmenize izin verilmiyor." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr "Bu senaryoda %s ulusu yok." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s ulusunu başkası almış." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s, %s ulusunun önderi %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%2$s tarafına %1$s hükmediyor." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Bilgiler metasunucuya gönderiliyor [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Oyun bitti..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "* Bu arazide şehir yapılamaz." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Ayar: %s ayarı \"%s\" olarak değiştirildi." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "Yeni istemcilerin bağlantıları kabul ediliyor." @@ -37895,56 +37892,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "Bir şehrin bilim üretimini %50 oranında arttırır." -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Teknoloji hedefimiz %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "%s teknolojisini %s tarafından çaldınız." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s sizden %s teknolojisini çaldı!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s, %s teknolojisini %s tarafından çaldı." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -38847,6 +38844,21 @@ msgstr "hata %d (strerror olmadan derlenmiş)" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "Bu komut sadece istemci tarafında verilebilir." + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "Bu komut sadece istemci tarafında verilebilir." + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv sürüm %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s şu anda %s inşa edemez." + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/uk.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/uk.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/uk.po freeciv-2.5.8/translations/freeciv/uk.po --- freeciv-2.5.7/translations/freeciv/uk.po 2017-05-13 12:08:01.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/uk.po 2017-08-12 11:54:46.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: freeciv 1.14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-10-06 17:27+0300\n" "Last-Translator: Sviatoslav Golda\n" "Language-Team: Ukrainian \n" @@ -361,12 +361,12 @@ "*%s (ШІ)* Нас було варварськи атаковано %s, і нам потрібна ваша допомога! " "Вшануйте наш славетний альянс і ваше ім'я ніколи не буде забуто!" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%s припинили будівництво дива %s у %s." -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%s розпочали будівництво чуда %s у %s." @@ -403,7 +403,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -801,13 +801,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1916,10 +1916,10 @@ msgstr "№" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "Прапор" @@ -2651,7 +2651,7 @@ msgstr "Якою нацією будете керувати?" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "Виберіть націю" @@ -3324,16 +3324,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "Назва" @@ -3443,11 +3443,11 @@ msgstr "Нації" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "Тип" @@ -3618,9 +3618,9 @@ msgid "Seen (Invis)" msgstr "Seen (Invis)" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "Невідомий" @@ -3741,7 +3741,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "Про помилки повідомляйте на %s\n" @@ -3765,7 +3765,7 @@ msgstr "Shift+Return" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "Огляд" @@ -4134,12 +4134,12 @@ msgid "Load Lua Script" msgstr "Загрузити скрипт Lua (_L)" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "Заснувати нове місто" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4169,8 +4169,8 @@ msgid "Set local options" msgstr "Встановити локальні настройки" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Налаштування гри" @@ -4544,8 +4544,8 @@ msgid "Game/Scenario Properties" msgstr "Властивості гри/сценарію" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "Зберегти сценарій" @@ -4904,7 +4904,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s , %s клієнт." @@ -4915,7 +4915,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, c-format msgid "" "%s%s\n" @@ -4926,267 +4926,260 @@ "зробив: %s\n" "%s клієнт" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s (%s), %s клієнт" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "Почати _нову гру" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "Почати гру за _сценарієм" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Завантажити гру" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "Приєднатися до Мережної Гри" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "Приє'днатись до ігрової зони" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "Вкажіть куди зберегти" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "Переглянути..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "Паролі не співпадають, введіть пароль." -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "Ім’я Сервера" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "Порт" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "Версія" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "Стан" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 msgid "?count:Players" msgstr "?count:Гравців" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "Люди" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "Комент" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "Локальна Мережа" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "_Метасервер інтернету " -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "Хост:" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "Порт:" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "_Логін:" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "_Пароль" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "Підтвердіть Пароль:" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "Хост" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "Приє'днатись" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "Ім'я з'єднання: %s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "Ім'я гравця: %s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "Адреса: %s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "Інформація про гравця/з'єднання" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s інфо" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "Перемкнути готовність гравця" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "Виберіть націю" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Спостерігати за цим гравцем" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "Взяти цього гравця" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "Обірвати з'єднання" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "Перемкнути ШІ гравця" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "Видалити гравця" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "Дати доступ %s" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "Помістити в %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "Не готовий" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "Готово (_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "Старт (_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "Взяти %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "Вибрати націю (_N)" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "Взяти Гравця" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "Спостерігати за %s (_O)" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "Спостерігати (_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "Не спостерігати (_o)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s ШІ>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "Випадково" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Спостерігач" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "Від'єднаний" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 msgid "" "Number of _Players\n" "(including AI):" @@ -5194,95 +5187,95 @@ "Кількість г_равців\n" "(включно з комп'ютерними):" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "Рівень ШІ:" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 msgid "Ruleset:" msgstr "Набір правил" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Додаткові опції гри..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "Рекорд" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "Рейтинг" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "Готовий" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "Вождь" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Команда" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "Виберіть Збережену Гру для Завантаження" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "Виберіть Збережену Гру для Завантаження:" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "Оберіть сценарій" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "Оберіть _сценарій:" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "Ім'я файла:" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Зберегти гру" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Збережені _ігри:" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "Ім'я _файла збереження:" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "Збережені сценарії" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "Зберегти сценарій" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "Зберегти зображення карти" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "Збережені зображення карти :" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "Зберегти зображення карти:" @@ -5802,7 +5795,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "Додаткова інформація отримується %s лівим клацанням по громадянах." -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 msgid "New Pass_word:" msgstr "_Пароль" @@ -5839,7 +5832,7 @@ msgstr "Змінити домівку" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "Загрузити" @@ -6077,8 +6070,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6255,7 +6248,7 @@ msgstr[1] "Впевнені, що хочете розпустити ті %1 загони?" msgstr[2] "Впевнені, що хочете розпустити тих %1 загонів?" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6271,7 +6264,7 @@ msgid "Yes" msgstr "Так" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6358,12 +6351,12 @@ msgid "This is Qt-client for Freeciv." msgstr "SDL Клієнт для Freeciv" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 msgid "Don't Observe" msgstr "Не спостерігати (_o)" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 msgid "Observe" msgstr "Спостерігати (_O)" @@ -6397,7 +6390,7 @@ "після '--'. Дивись документацію з Qt.\n" "\n" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 msgid "Quit?" msgstr "Вийти?" @@ -6551,9 +6544,9 @@ msgid "Game" msgstr "Гра" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "Опції" @@ -6578,8 +6571,8 @@ msgid "Leave game" msgstr "Залишити гру" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6838,7 +6831,7 @@ msgstr "Податки..." #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 msgid "?header:Players" msgstr "?header:Гравці" @@ -6886,7 +6879,7 @@ msgid "... read more in help" msgstr "...читай ще в допомозі" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "Поновити" @@ -6896,123 +6889,117 @@ msgstr "Застосувати" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, c-format msgid "%s%s, Qt client" msgstr "%s%s Qt клієнта." #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, c-format msgid "commit: %s" msgstr "відправити: %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 msgid "Qt client" msgstr "Qt клієнта." -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s (%s), Qt клієнт" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start new game" msgstr "Почати нову гру" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 msgid "Start scenario game" msgstr "Почати гру за _сценарієм" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Load saved game" msgstr "Завантажити гру" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 msgid "Connect to network game" msgstr "Приєднатися до Мережевої Гри" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "З’єднатись" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 msgid "Login" msgstr "Логін:" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "Пароль:" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 msgid "Confirm Password" msgstr "Підтвердіть Пароль:" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 msgid "Internet servers:" msgstr "_Метасервер інтернету " -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 msgid "Local servers:" msgstr "Локальний сервер" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "Дата" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 msgid "Browse..." msgstr "Огляд..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 msgid "Load Scenario" msgstr "Завантажити сценарій" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 msgid "Leader" msgstr "Вождь:" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Відключитись" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "Почати" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 msgid "Save Files" msgstr "Зберегти файли" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 msgid "Open Save File" msgstr "відкрити Ім'я _файла збереження:" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 msgid "Scenarios Files" msgstr "Файли сценарію" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 msgid "Open Scenario File" msgstr "Відкрити Файл сценарію" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 msgid "Global observers" msgstr "Глобальний спостерігач" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 msgid "Not ready" msgstr "Не готовий" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "Задати Важкість:" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 msgid "Put on team" msgstr "Призначити в команду" @@ -7115,7 +7102,7 @@ msgid "Back" msgstr "Назад" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "Завантажити гру" @@ -8259,44 +8246,38 @@ msgstr "Додати новий план робіт" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, c-format msgid "Freeciv %s" msgstr "Freeciv %s" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv версії %s (%s)" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, c-format msgid "%s client" msgstr "Клієнт %s" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "Почати нову гру" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "Приєднатись до гри" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "Приєднатись до публічного сервера" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "Приєднатись до сервера локальної мережі" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "Вас вітає SDLClient..." -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, c-format msgid "Commit: %s" msgstr "Відправити: %s" @@ -15301,83 +15282,83 @@ msgid "?unitflag:Hunter" msgstr "?unitflag:Мисливець" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv версія %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "(бета версія)" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv версії %s (%s)" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv версія %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "бета версія " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "версія " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "Січень" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "Лютий" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "Березень" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "Квітень" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "Травень" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "Червень" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "Липень" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "Серпень" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "Вересень" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "Жовтень" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "Листопад" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "Грудень" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15386,7 +15367,7 @@ "ЦЕ БЕТА ВЕРСІЯ\n" "Freeciv %s буде випущено у %s, в %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15395,7 +15376,7 @@ "ЦЕ БЕТА ВЕРСІЯ\n" "Freeciv %s буде випущено у %s" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "Бо Цивілізація має бути вільною!" @@ -16289,61 +16270,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "Кожен податківець додає до вашої скарбниці дві гривні за хід." -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "Європейськіий" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "Класичний" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "Тропічні" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "Азіатський" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "Вавілонський" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "Кельтський" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "Ренесансний" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "Індустріальний" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "Сучасні" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "Пост-модерні" @@ -18152,18 +18133,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "новобранець" @@ -18914,14 +18895,14 @@ "місто, де Ви розпочали будувати диво, та закінчити його за один хід!" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Ватажок дикунів" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20862,9 +20843,9 @@ "Дослідники - це хоробрі люди, що стають у пригоді при дослідженні невідомих " "територій." -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -21273,8 +21254,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "Кожен податківець додає до скарбниці три золотих за хід." -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "Вік Електрики" @@ -21713,13 +21694,19 @@ msgstr "" "Це Ви. Якщо втратите цей підрозділ, Ви програєте гру. Тож не втрачайте." -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "* Лише дикуни можуть будувати це.\n" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "Літак спостереження" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -30705,19 +30692,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "?" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "Невідома" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "Не встановлено" @@ -30773,11 +30760,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "Установщик modpackів для Freeciv (версія для комндного рядка)" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "Установка modpack’а вдалась." -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "Збій установки modpack: %s" @@ -30809,7 +30796,7 @@ msgid "Automatically install modpack from a given URL" msgstr "Автоматично встановити modpackз даного URL" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" @@ -30817,7 +30804,7 @@ "Іде установка Modpack’а .\n" "Ви впевнені, що хочете вийти?" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "Інше завантаження вже йде" @@ -30825,7 +30812,7 @@ msgid "Failed to start downloader" msgstr "Не вдалося запустити завантажувач" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" @@ -30834,40 +30821,40 @@ "%s%s\n" "commit: %s" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "Встановлено" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "Тип" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "Підтип" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "Ліцензія" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "URL" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "Встановити modpack" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "URL модпака" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "Оберіть modpack для установки" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" @@ -30877,11 +30864,11 @@ "після '--'. Дивись документацію Gtk.\n" "\n" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "Установщик modpack для Freeciv (gtk2)" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "Установщик modpack для Freeciv (gtk3)" @@ -31167,103 +31154,103 @@ msgid "A poorly-named city" msgstr "Погано назване місто" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "Змінено домівку для %s на %s." #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "%s вже має %s. Не можу перепраити Ваш." -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "Переправлено %s у %s з %s у %s." -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "Переправлено %s з %s у %s." #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "%s %s втрачено при переході до %s %s." -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "%s втрачено разом з контролем над %s." #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "Заміна %s збудована у %s." -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Ви вже маєте місто %s. Назву міста змінено на %s." -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "Люди у %s вражені Вашим технологічним рівнем!" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "Робітники самовільно зібрались і модернізували %s %s." -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "Робітники самовільно зібрались і модернізували %s доріг." -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "Робітники самовільно зібрались і модернізували бази %s." -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "Ви заснували %s" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" "Переміщено %s з розпущеного міста %s тому що він не може залишатися на %s." -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "Коли %s розпустили, ваш %s не зміг вибратися та був втрачений." -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "Коли %s було розпущено, ваш %s у %s попав у пастку і був втрачений." -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "Ви повністю знищили %s." -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s знищений %s." -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -31271,7 +31258,7 @@ msgstr[1] "Ви захопили %s; здобич склала %d гривні!" msgstr[2] "Ви захопили %s; здобич склала %d гривень!" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -31279,17 +31266,17 @@ msgstr[1] "%s захопив %s та отримав з міста здобичі %d гривні." msgstr[2] "%s захопив %s та отримав з міста здобичі %d гривень." -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "Ви захопили %s." -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s захопив %s." -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -31297,7 +31284,7 @@ msgstr[1] "Ви визволили %s! Здобич склала %d гривні!" msgstr[2] "Ви визволили %s! Здобич склала %d гривень!" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -31305,54 +31292,54 @@ msgstr[1] "%s визволив %s та отримав з міста здобичі %d гривні." msgstr[2] "%s визволив %s та отримав з міста здобичі %d гривень." -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "Ви визволили %s!" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s визволив %s." -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "Торг між %s і %s втрачений разом з містом." -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "Торговий шлях між %s і %s скасовано." #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "Торгівля між %s містом %s і %s втрачена, разом з їх містом." -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "На жаль, %s скасував торговий шлях з %s до Вашого міста %s." #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Ми скасували торговий шлях з %s до %s міста %s." -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " з плану будівництва" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s будує %s%s." -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -31360,16 +31347,16 @@ msgstr[1] "Ви продали %s у %s (тепер блоковано землею) за %d гривні." msgstr[2] "Ви продали %s у %s (тепер блоковано землею) за %d гривень." -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "Розмір міської карти %s став %s" -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "збільшилось" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "зменшилось" @@ -31646,20 +31633,21 @@ msgid "The %s have started building a spaceship!" msgstr "%s почали будувати зореліт!" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s поки що не може збудувати %s." +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* Можуть засновувати міста (початкове населення %d).\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s збудував %s." #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." @@ -31667,70 +31655,70 @@ msgstr[1] "%s коштує %d населення. %s зменшується до розміру %d." msgstr[2] "%s коштує %d населення. %s зменшується до розміру %d." -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "Неможливо утримувати %s у %s, будівлю продано!" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "Недостатньо грошей. %s розпущено." -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "Забруднення біля %s." -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "Святкування на вашу честь у %s." -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "Святкування скасовані у %s." -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "%s вражено пошестю! Населення гине!" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "Заворушення у %s." -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "ЗАВОРУШЕННЯ ПРОДОВЖУЮТЬСЯ у %s." -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "Спокій відновлено у %s." -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Вашу %s скинуто, країна у хаосі." -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" "%s не може поки що збудувати %s, і ми не можемо розпустити наше єдине місто." #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s розпущено на %s." #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" @@ -31738,7 +31726,7 @@ "Емігранти з %s не можуть переселитися до %s, бо там недостатньо харчів!" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -31747,7 +31735,7 @@ "Емігранти з %s не можуть переселитися до %s (%s), бо там недостатньо харчів!" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -31756,7 +31744,7 @@ "Емігранти з %s (%s) не можуть переселитися до %s, бо там недостатньо харчів!" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" @@ -31764,7 +31752,7 @@ "Емігранти з %s не можуть піти до %s, бо там для росту потрібна будівля!" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" @@ -31772,7 +31760,7 @@ "Емігранти з %s не можуть піти до %s (%s), бо там для росту потрібна будівля!" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" @@ -31780,71 +31768,71 @@ "Емігранти з %s (%s) не можуть переселитися до %s, бо там для росту потрібна " "певна будівля!" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "%s розібрано своїми городянами." #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "Емігранти з %s переселилися до %s у пошуках кращої долі." #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "Емігранти з %s переселилися до %s (%s) у пошуках кращої долі." #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "Емігранти з %s (%s) переселилися до %s у пошуках кращої долі." #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "Сталося лихо! %2$s в місті %1$s." -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, c-format msgid "Fallout near %s." msgstr "Ядерні опади біля %s." #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, c-format msgid "%s causes population loss in %s." msgstr "%s спричиняє втрату населення в %s." #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, c-format msgid "%s destroys %s in %s." msgstr "%s знищує %s у %s." #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "Весь запас іжі знищений у %s." #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, c-format msgid "Production of %s in %s destroyed." msgstr "Виробництво %s у %s знищене." -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "Городяни %s думають емігрувати до %s у пошуках кращої долі." #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -33780,32 +33768,32 @@ msgid "Your %s was captured after completing the mission." msgstr "Вашого %s захопили після вдалого виконання свого завдання." -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "Ви призвели до інциденту, намагаючись підкупити %s %s." -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s призвів до інциденту при підкупі вашого %s." -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "Ви спричинили прикрий інцидент, намагаючись вкрасти технології у %s." -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s спричинив прикрий інцидент, пробуючи викрасти у Вас технології." -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "Ви призвели до інциденту при влаштуванні заколоту у %s." -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s призвів до інциденту під час збурення заколоту у %s." @@ -34159,19 +34147,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "Таймаут ходу менше нуля, виправляю на нуль." -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "Сервер не зміг приначити місця появи." -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "Багато землі - це займе декілька секунд." -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "Генератор 3 не може розташувати всі великі острови." -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "Генератор 3 залишив нерозміщеними %li земель." @@ -34347,12 +34335,12 @@ "bases." msgstr "Робітники на радощах збираються і покращують всі міста кращими базами" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Переміщено Ваш %s внаслідок зміни місцевості." -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Розпустили Ваш %s внаслідок зміни місцевості." @@ -35026,8 +35014,8 @@ "Збережена гра містить неповні дані мапи. Це може вказувати на гру старої " "версії або погано збережену гру. Продовжуємо на Ваш страх та ризик." -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "Додав %s як ШІ рівня %s гравець (%s)." @@ -37804,7 +37792,16 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "Замирення з %s завершено. Тепер Ви у стані війни з %s." -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" +"Замирення між %s та %s скінчилося. Тепер вони воюють. Ви скасували ваш " +"альянс з обома." + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " @@ -37813,51 +37810,51 @@ "Замирення між %s та %s скінчилося. Тепер вони воюють. Ви скасували ваш " "альянс з обома." -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "Авторозміщувані частини космольота, що не були розміщені." -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "Непідтримуваний тип стиснення %d." -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "Помилка збереження гри в %s" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "Гру збережено в %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "Гра вже йде." -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" "%s втратив керування cmdlevel на початку гри. Відтепер використовуйте " "голосування." -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Починаємо гру." -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "запит на невідомий звіт (тип %d)" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "Увага: відмовлено застарілому клієнту %s" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -37865,49 +37862,49 @@ "Ваш клієнт застарий. Щоб використовувати цей сервер, будь ласка, оновіть ваш " "клієнт щонайменше до Freeciv 2.2." -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "Вам не дозволено редагувати." -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "Нація %s не доступна для вибору користувача." -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "Нація %s вже використовується." -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s є правителем %s - %s." -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "Чекаємо початку гри: %d з %d гравців готові починати." -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "запитано більше ніж установка 'maxplayers'" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "нестача гральних націй в наборі народів (див установку 'nationset')" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "недостатньо граних народів" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s головує над %s." -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." @@ -37915,33 +37912,33 @@ "Програма freeciv-server має підтримку аутентифікації гравців, але зараз вона " "не використовується." -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "Відправляю інфо на метасервер <%s>." -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "Не починаю без явно запитаного з’єднання з метасервером." -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Кінець гри..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "Невдача при створенні придатної карту, пробую з іншим посівом" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "Не можу створити придатну карту з такими установками." -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "Опція: %s перевстановлена з %s в %s." -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "Тепер приймаємо нові з'єднання на порту %d." @@ -39778,17 +39775,17 @@ msgid "%s acquire %s as a result of learning %s." msgstr "%s отримав %s як наслідок вивчення %s." -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "Недостатня наукова віддача. Ми втратили Науку Майбутнього %d." -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "Недостатній виробіток науки. Ми забули %s" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " @@ -39797,7 +39794,7 @@ "Наука потрбіна для нашого нового уряду '%s' забута. Громадяни почали " "революцію до '%s'" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " @@ -39806,32 +39803,32 @@ "Наука потрбіна для нашого нового уряду '%s' забута. Натомість громадяни " "вибрали устрій '%s'" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "%s не може робити %s. Необхідна наука втрачена." -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "Наукова ціль %s." -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "Ви вкрали %s у %s." -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s вкрав у Вас %s!" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "%s вкрав %s з %s." -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "От халепа! Ви схибили передаючи науку %s і втратили її" @@ -40746,6 +40743,18 @@ msgid "error %d (compiled without strerror)" msgstr "помилка %d (зібрано без strerror)" +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s (%s), %s клієнт" + +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s (%s), Qt клієнт" + +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv версії %s (%s)" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s поки що не може збудувати %s." + #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/zh_CN.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/zh_CN.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/zh_CN.po freeciv-2.5.8/translations/freeciv/zh_CN.po --- freeciv-2.5.7/translations/freeciv/zh_CN.po 2017-05-13 12:08:01.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/zh_CN.po 2017-08-12 11:54:47.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Hongjia Cao \n" "Language-Team: zh_CN \n" @@ -292,12 +292,12 @@ "*%s (AI)* %s ҰعǣҪİǹͬ˵ijŵ" "ɣֽᱻ" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%1$s ֹͣ %3$s н %2$s" -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr " %1$s ʼ %3$s н %2$s" @@ -329,7 +329,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -727,13 +727,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1840,10 +1840,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "" @@ -2580,7 +2580,7 @@ msgstr "ΪǸ壿" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 #, fuzzy msgid "Pick Nation" @@ -3235,16 +3235,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "" @@ -3368,11 +3368,11 @@ msgstr "" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "" @@ -3547,9 +3547,9 @@ msgid "Seen (Invis)" msgstr "ѡ񲿶" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "δ֪" @@ -3671,7 +3671,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "󱨸淢͵ <%s>\n" @@ -3695,7 +3695,7 @@ msgstr "" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "" @@ -4075,12 +4075,12 @@ msgid "Load Lua Script" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "³" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -4110,8 +4110,8 @@ msgid "Set local options" msgstr "ñѡ" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "Ϸ" @@ -4525,8 +4525,8 @@ msgid "Game/Scenario Properties" msgstr "" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Save Scenario" msgstr "ʼϷ(_S)" @@ -4919,7 +4919,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, fuzzy, c-format msgid "%s%s, %s client" msgstr "ֻڿͻʹá" @@ -4930,7 +4930,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4938,378 +4938,371 @@ "%s client" msgstr "ֻڿͻʹá" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "ֻڿͻʹá" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "ʼϷ(_N)" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "ʼϷ(_S)" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "Ϸ(_L)" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "ӵϷ(_O)" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 #, fuzzy msgid "Connect to Gaming _Zone" msgstr "ӵϷ" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "ѡҪ浽λ" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "(_B)..." -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "ȷ" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "˿" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "汾" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "״̬" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 #, fuzzy msgid "Humans" msgstr "" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "˵" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "(_A)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "Ԫ(_M)" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "(_H)" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "˿(_P)" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "¼(_L)" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "(_W)" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "ȷϿ(_I)" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "(_O)" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, fuzzy, c-format msgid "Connection name: %s" msgstr "" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "֣%s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "%s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "/Ϣ" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s Ϣ" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "л״̬" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "ѡ" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "Թ۴" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "ȡ" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "ж" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "лǷΪ AI" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "ɾ" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, fuzzy, c-format msgid "Give %s access" msgstr " info ʼ" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, fuzzy, c-format msgid "Put on %s" msgstr "˿ڣ%s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "δ(_r)" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "(_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "ʼ(_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, fuzzy, c-format msgid "_Take %s" msgstr " %s" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "ѡ壨_N" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 #, fuzzy msgid "_Take a Player" msgstr "ȡ" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, fuzzy, c-format msgid "_Observe %s" msgstr "Թߣ%s" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "Թ(_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 #, fuzzy msgid "Do not _observe" msgstr "Թ(_O)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, fuzzy, c-format msgid "<%s AI>" msgstr "AI" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "Թ" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 #, fuzzy msgid "Detached" msgstr "" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "ĿAI(_P)" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 #, fuzzy msgid "AI Skill _Level:" msgstr "AIܼ(_L)" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "ɳĮ" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "Ϸѡ(_M)..." -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 #, fuzzy msgid "Record" msgstr "" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 #, fuzzy msgid "Rating" msgstr "ɳʻʺ" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 #, fuzzy msgid "?player:Leader" msgstr "" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "Ŷ" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "ѡҪĴϷļ" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "ѡҪĴϷļ(_L)" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "ѡ" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "ѡ(_S)" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 #, fuzzy msgid "Filename:" msgstr "ļ(_F)" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "Ϸ" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "Ϸ(_G)" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "ļ(_F)" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 #, fuzzy msgid "Saved Sce_narios:" msgstr "ʼϷ(_S)" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 #, fuzzy msgid "Save Sc_enario:" msgstr "ʼϷ(_S)" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Save Map Image" msgstr "Ϸ" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 #, fuzzy msgid "Saved Map _Images:" msgstr "Ϸ(_G)" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 #, fuzzy msgid "Save _Map Images:" msgstr "Ϸ(_G)" @@ -5843,7 +5836,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "(_W)" @@ -5883,7 +5876,7 @@ msgstr "Ϊس" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 msgid "Load" msgstr "װ" @@ -6156,8 +6149,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6344,7 +6337,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "ȷ˳" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6360,7 +6353,7 @@ msgid "Yes" msgstr "" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6447,13 +6440,13 @@ msgid "This is Qt-client for Freeciv." msgstr " Freeciv Ŀͻ" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "Թ(_O)" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "Թ(_O)" @@ -6487,7 +6480,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "˳" @@ -6651,9 +6644,9 @@ msgid "Game" msgstr "Ϸ" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "ѡ" @@ -6682,8 +6675,8 @@ msgid "Leave game" msgstr "Ϸ" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6971,7 +6964,7 @@ msgstr "˰ʡ" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -7024,7 +7017,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "ˢ" @@ -7035,144 +7028,138 @@ msgstr "Ӧ" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "ֻڿͻʹá" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr " %s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "ֻڿͻʹá" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "ֻڿͻʹá" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "ʼϷ" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "ʼϷ(_S)" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "װϷ" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "ӵϷ(_O)" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "¼" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 #, fuzzy msgid "Password" msgstr "" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "ȷϿ(_I)" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "Ԫ(_M)" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "Թ" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "(_B)..." -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "ʼϷ(_S)" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "쵼" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "Ͽ" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 #, fuzzy msgid "Start" msgstr "ʼ(_S)" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "ȡ" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "ļ(_F)" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "ʼϷ(_S)" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "ʼϷ(_S)" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "Թ" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "δ(_r)" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 #, fuzzy msgid "Set difficulty" msgstr "Ѷȼ %s" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "˿ڣ%s" @@ -7285,7 +7272,7 @@ msgid "Back" msgstr "" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "װϷ" @@ -8468,47 +8455,41 @@ msgstr "б" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv 汾 %s %s" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "ֻڿͻʹá" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "ʼϷ" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 #, fuzzy msgid "Join Game" msgstr "¼" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 #, fuzzy msgid "Join Pubserver" msgstr " Թߣ" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 #, fuzzy msgid "Join LAN Server" msgstr "" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr " %s" @@ -15494,83 +15475,83 @@ msgid "?unitflag:Hunter" msgstr "ֱ" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv 汾 %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "beta 棩" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, fuzzy, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv 汾 %s %s" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv 汾 %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "beta ԰ " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "汾 " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "һ" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "ʮ" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "ʮһ" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "ʮ" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15579,7 +15560,7 @@ "һBeta\n" "Freeciv %s %s %s С" -#: common/version.c:158 +#: common/version.c:127 #, fuzzy, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -15588,7 +15569,7 @@ "һBeta\n" "Freeciv %s %s %s С" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "ΪӦɵģ" @@ -16439,61 +16420,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "ŷ" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "ŵ" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "ȴ" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "ͱ" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "ո" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "ҵ" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "ִ" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "ִ" @@ -18215,18 +18196,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "" @@ -18867,14 +18848,14 @@ "һغ漣" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "Ұͷ" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -20679,9 +20660,9 @@ "territory." msgstr "̽ռΪδ֪Ƶͼúܴ" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 #, fuzzy msgid "" "When a Barbarian Leader is killed on a tile without any defending units, the " @@ -21071,8 +21052,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 #, fuzzy msgid "?citystyle:ElectricAge" msgstr "" @@ -21483,13 +21464,19 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "ԼʧӣϷԱʧ" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +#, fuzzy +msgid "Won't unleash barbarians from huts." +msgstr "Ϸ ֻɡӿ" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "Ԥ" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -28802,20 +28789,20 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 #, fuzzy msgid "?license:Unknown" msgstr "δ֪" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -28870,12 +28857,12 @@ msgid "Freeciv modpack installer (command line version)" msgstr "ѡҪȡĽչ" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 #, fuzzy msgid "Modpack installed successfully" msgstr "%s ɹ" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -28907,14 +28894,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "ȷ˳" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -28923,60 +28910,60 @@ msgid "Failed to start downloader" msgstr " AI Ҵ%s" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 #, fuzzy msgid "Select modpack to install" msgstr "ѡҪȡĽչ" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 #, fuzzy msgid "Freeciv modpack installer (gtk2)" msgstr "ѡҪȡĽչ" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 #, fuzzy msgid "Freeciv modpack installer (gtk3)" msgstr "ѡҪȡĽչ" @@ -29247,201 +29234,201 @@ msgid "A poorly-named city" msgstr "֮" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr " %s ĻسиıΪ %s " #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr " %2$s н %1$s %3$s תƸ %4$s" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr " %s %s תƸ %s " #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, fuzzy, c-format msgid "%s %s lost in transfer to %s %s" msgstr "תƵ %3$s %4$s ʧ %1$s %2$s" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "ʧȥ %2$s Ƶͬʱʧ %1$s" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, fuzzy, c-format msgid "A replacement %s was built in %s." msgstr " %2$s нµ %1$s" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "Ѿһ %sˡ бΪ %s " -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, fuzzy, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" "%s еԿƼĶ𾪣\n" " Էټ·˳С" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, fuzzy, c-format msgid "You have founded %s." msgstr " %s" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "Ϸ %s Ƴ˽ɢij %s Աⱻ½ذΧ" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr " %s ɢʱ %s ûܳʧˡ" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, fuzzy, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr " %s ɢʱ %s ûܳʧˡ" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "׻ %s" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "%s %s ˡ" -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] " %s սƷܼΪ %d ƽ" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "%s %s ӸóӶ %d ƽ" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, fuzzy, c-format msgid "You conquer %s." msgstr " %s " -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "%s %s" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] " %s սƷܼΪ %d ƽ" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "%s %s ӸóӶ %d ƽ" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr " %s" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "%s %s" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "Ǹ%s ȡ˴ %s ij %s ó·ߡ" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, fuzzy, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "Ǹ%s ȡ˴ %s ij %s ó·ߡ" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr " ӹб" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "%s ڽ %s%s" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] " %3$d ƽļ۸ %2$s е %1$s Ŀǰ½ذΧ" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "%2$s%3$s %1$s" -#: server/citytools.c:3140 +#: server/citytools.c:3144 #, fuzzy msgid "increased" msgstr "վ" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -29687,95 +29674,96 @@ msgid "The %s have started building a spaceship!" msgstr "%s ʼɴ" -#: server/cityturn.c:1781 -#, c-format -msgid "%s can't build %s yet." -msgstr "%s ޷޽ %s" +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 +#, fuzzy, c-format +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" +msgstr "* ܹ³С\n" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "%s Ѿ %s" #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "޷֧ %2$s е %1$s άѣ۳" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, fuzzy, c-format msgid "Not enough gold. %s disbanded." msgstr "ƽ㡣 %s ɢ" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "%s Ⱦ" -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, fuzzy, c-format msgid "Celebrations canceled in %s." msgstr "Ѿʹˡ" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr " %s ɧҡ" -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "%s еɧڼ" -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "%s ָ" -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "Ʒ %s ĹҴڻ֮С" -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "%s ޷ %sDzܽɢΨһijС" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "%s üΪ %s" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -29783,7 +29771,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -29791,91 +29779,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, fuzzy, c-format msgid "%s was disbanded by its citizens." msgstr "%s üΪ %s" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, fuzzy, c-format msgid "%s was hit by %s." msgstr "%s ⵽ %s ĺĹ" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "%s Ⱦ" #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "ĵ %s ˿ڼ١" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%1$s ڴݻ %3$s е %2$s " #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, fuzzy, c-format msgid "All stored food destroyed in %s." msgstr " %1$s ݻ %3$s е %2$s" #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "%3$s %1$s Ϊ %2$s" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -31690,32 +31678,32 @@ msgid "Your %s was captured after completing the mission." msgstr " %s ʹץסˡ" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, fuzzy, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "ڻ¸ %s %s ʱ⡣" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "%s ڻ¸ %s ʱ⡣" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "ڴ %s ȡƼʱ⡣" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "%s ڴȡƼʱ⡣" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr " %s ɿʱ⡣" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, fuzzy, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "%s %s ɿʱ⡣" @@ -32037,19 +32025,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "غϳʱС0Ϊ0 " -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "͵½ Ҫӡ" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr " 3 δܳɹеĴ͵졣" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "3 %li ½δܷá" @@ -32225,12 +32213,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "Ϊıζƶ %s " -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "Ϊıζɢ %s " @@ -32902,8 +32890,8 @@ "ļвĵͼݡǾɵĴϷ߱һЧĴ" "ļĻԸ" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, fuzzy, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s ѾΪ %s AI Ҽ롣" @@ -35507,56 +35495,63 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr " %s ͣЭˡ %s ս״̬" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, fuzzy, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "Ŷӻ %s %s սˡȡ %s ͬˡ" + +#: server/srv_main.c:808 #, fuzzy, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "Ŷӻ %s %s սˡȡ %s ͬˡ" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, fuzzy, c-format msgid "Unsupported compression type %d." msgstr "ֵ֧ѡ%s" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "ϷΪ %s ʧ" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "ϷѴΪ %s" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "ϷѾС" -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "Ϸʼʱ %s ʧȥ˿𡣴ڿʼʹͶƱ" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "Ϸ" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "δ֪ı %d" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "棺 ܾɵĿͻ %s " -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." @@ -35564,83 +35559,83 @@ "Ŀͻ̫ˡҪʹô˷ĿͻΪ2003-11-28CVS汾 " "Freeciv 2.2 ߡ" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 #, fuzzy msgid "You are not allowed to edit." msgstr "ôѡ" -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, fuzzy, c-format msgid "%s nation is not available for user selection." msgstr " %s 龰вʹá" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "%s Ѿʹˡ" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "%s Ϊ %s ͳ %s " -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, 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:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "%s ͳ %s" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, fuzzy, c-format msgid "Sending info to metaserver <%s>." msgstr "Ϣ͵Ԫ [%s]" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "Ϸ..." -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 #, fuzzy msgid "Cannot create suitable map with given settings." msgstr "* ڴ˵ϽС" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "ѡ%s ѱΪ%s" -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, fuzzy, c-format msgid "Now accepting new client connections on port %d." msgstr "ڽ¿ͻ˵ӡ" @@ -37468,56 +37463,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, fuzzy, c-format msgid "Insufficient science output. We lost %s." msgstr "ʹеĿв 50%" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, fuzzy, c-format msgid "Technology goal is %s." msgstr "ƼĿΪ %s" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, fuzzy, c-format msgid "You steal %s from the %s." msgstr " %2$s ȡ %1$s" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, fuzzy, c-format msgid "The %s stole %s from you!" msgstr "%s ͵ȥ %s" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, fuzzy, c-format msgid "The %s have stolen %s from the %s." msgstr "%1$s %3$s ȡ %2$s " -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -38396,6 +38391,21 @@ msgstr " %d ʱδ strerror" #, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "ֻڿͻʹá" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "ֻڿͻʹá" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv 汾 %s %s" + +#~ msgid "%s can't build %s yet." +#~ msgstr "%s ޷޽ %s" + +#, fuzzy #~ msgid "" #~ "Allows a city to grow larger than size 8 and reduces the chance of plague " #~ "within the city. A Sewer System is required for a city to grow larger " Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/freeciv/zh_TW.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/freeciv/zh_TW.gmo differ diff -Nru freeciv-2.5.7/translations/freeciv/zh_TW.po freeciv-2.5.8/translations/freeciv/zh_TW.po --- freeciv-2.5.7/translations/freeciv/zh_TW.po 2017-05-13 12:08:02.000000000 +0000 +++ freeciv-2.5.8/translations/freeciv/zh_TW.po 2017-08-12 11:54:47.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: freeciv 2.4.99-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:07+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-08-24 23:47+0800\n" "Last-Translator: Zhang Xiaowei \n" "Language-Team: Chinese (Traditional) \n" @@ -295,12 +295,12 @@ "*%s (AI)* 我們被 %s 野蠻地攻擊了！需要你伸出援手！兌現我們輝煌的同盟誓言，你" "的名字我們將沒齒難忘！" -#: ai/default/aicity.c:317 server/citytools.c:2804 +#: ai/default/aicity.c:317 server/citytools.c:2808 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "%1$s 停止在 %3$s 建造%2$s。" -#: ai/default/aicity.c:328 server/citytools.c:2844 +#: ai/default/aicity.c:328 server/citytools.c:2848 #, c-format msgid "The %s have started building The %s in %s." msgstr "%1$s 正在 %3$s 建造%2$s。" @@ -332,7 +332,7 @@ #. TRANS: No full stop after the URL, could cause confusion. #: client/agents/cma_core.c:426 client/gui-sdl/mapview.c:158 -#: server/console.c:71 server/srv_main.c:2785 utility/log.c:516 +#: server/console.c:71 server/srv_main.c:2824 utility/log.c:516 #: utility/netintf.c:97 utility/registry_ini.c:747 #, c-format msgid "Please report this message at %s" @@ -721,13 +721,13 @@ #: client/cityrepdata.c:641 client/gui-gtk-2.0/citizensinfo.c:65 #: client/gui-gtk-2.0/editprop.c:3485 client/gui-gtk-2.0/editprop.c:4271 -#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1326 -#: client/gui-gtk-2.0/pages.c:2709 client/gui-gtk-3.0/citizensinfo.c:65 +#: client/gui-gtk-2.0/gotodlg.c:213 client/gui-gtk-2.0/pages.c:1320 +#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-3.0/citizensinfo.c:65 #: client/gui-gtk-3.0/editprop.c:3516 client/gui-gtk-3.0/editprop.c:4301 -#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1409 -#: client/gui-gtk-3.0/pages.c:2776 client/gui-qt/citydlg.cpp:1767 -#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:283 -#: client/gui-qt/pages.cpp:554 client/gui-qt/plrdlg.cpp:447 +#: client/gui-gtk-3.0/gotodlg.c:219 client/gui-gtk-3.0/pages.c:1403 +#: client/gui-gtk-3.0/pages.c:2770 client/gui-qt/citydlg.cpp:1767 +#: client/gui-qt/gotodlg.cpp:68 client/gui-qt/pages.cpp:276 +#: client/gui-qt/pages.cpp:547 client/gui-qt/plrdlg.cpp:447 #: client/gui-qt/repodlgs.cpp:1402 client/gui-sdl/repodlgs.c:2079 #: client/plrdlg_common.c:307 msgid "Nation" @@ -1790,10 +1790,10 @@ msgstr "" #: client/gui-gtk-2.0/citizensinfo.c:64 client/gui-gtk-2.0/editprop.c:3516 -#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2707 +#: client/gui-gtk-2.0/editprop.c:3528 client/gui-gtk-2.0/pages.c:2701 #: client/gui-gtk-3.0/citizensinfo.c:64 client/gui-gtk-3.0/editprop.c:3547 -#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2774 -#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:554 +#: client/gui-gtk-3.0/editprop.c:3559 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-qt/citydlg.cpp:1767 client/gui-qt/pages.cpp:547 #: client/plrdlg_common.c:306 msgid "Flag" msgstr "旗幟" @@ -2502,7 +2502,7 @@ msgstr "你想當哪個民族？" #: client/gui-gtk-2.0/dialogs.c:883 client/gui-gtk-3.0/dialogs.c:895 -#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:576 +#: client/gui-qt/dialogs.cpp:262 client/gui-qt/pages.cpp:569 #: client/gui-sdl/chatline.c:810 data/Freeciv.in:3428 msgid "Pick Nation" msgstr "挑選民族" @@ -3124,16 +3124,16 @@ #: client/gui-gtk-2.0/editprop.c:3503 client/gui-gtk-2.0/editprop.c:3518 #: client/gui-gtk-2.0/editprop.c:3530 client/gui-gtk-2.0/editprop.c:3540 #: client/gui-gtk-2.0/editprop.c:4244 client/gui-gtk-2.0/editprop.c:4265 -#: client/gui-gtk-2.0/pages.c:1323 client/gui-gtk-2.0/pages.c:2697 +#: client/gui-gtk-2.0/pages.c:1317 client/gui-gtk-2.0/pages.c:2691 #: client/gui-gtk-2.0/wldlg.c:998 client/gui-gtk-3.0/editprop.c:3509 #: client/gui-gtk-3.0/editprop.c:3518 client/gui-gtk-3.0/editprop.c:3534 #: client/gui-gtk-3.0/editprop.c:3549 client/gui-gtk-3.0/editprop.c:3561 #: client/gui-gtk-3.0/editprop.c:3571 client/gui-gtk-3.0/editprop.c:4274 -#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1406 -#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/pages.cpp:553 data/Freeciv.in:97 -#: tools/civmanual.c:424 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-3.0/editprop.c:4295 client/gui-gtk-3.0/pages.c:1400 +#: client/gui-gtk-3.0/pages.c:2758 client/gui-gtk-3.0/wldlg.c:1001 +#: client/gui-qt/pages.cpp:276 client/gui-qt/pages.cpp:546 data/Freeciv.in:97 +#: tools/civmanual.c:424 tools/mpgui_gtk2.c:460 tools/mpgui_gtk3.c:463 +#: tools/mpgui_qt.cpp:212 msgid "Name" msgstr "名稱" @@ -3243,11 +3243,11 @@ msgstr "民族" #. TRANS: Image header -#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1324 +#: client/gui-gtk-2.0/editprop.c:4220 client/gui-gtk-2.0/pages.c:1318 #: client/gui-gtk-2.0/repodlgs.c:758 client/gui-gtk-2.0/wldlg.c:998 -#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1407 +#: client/gui-gtk-3.0/editprop.c:4250 client/gui-gtk-3.0/pages.c:1401 #: client/gui-gtk-3.0/repodlgs.c:786 client/gui-gtk-3.0/wldlg.c:1001 -#: client/gui-qt/pages.cpp:283 client/gui-qt/repodlgs.cpp:1054 +#: client/gui-qt/pages.cpp:276 client/gui-qt/repodlgs.cpp:1054 msgid "Type" msgstr "類型" @@ -3404,9 +3404,9 @@ msgid "Seen (Invis)" msgstr "" -#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:667 -#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:741 -#: client/gui-qt/pages.cpp:765 client/gui-sdl/citydlg.c:1985 +#: client/gui-gtk-2.0/editprop.c:6254 client/gui-gtk-2.0/pages.c:661 +#: client/gui-gtk-3.0/editprop.c:6301 client/gui-gtk-3.0/pages.c:735 +#: client/gui-qt/pages.cpp:758 client/gui-sdl/citydlg.c:1985 #: client/gui-xaw/citydlg.c:1481 client/text.c:166 common/unit.c:800 msgid "Unknown" msgstr "未知" @@ -3525,7 +3525,7 @@ #: client/gui-gtk-2.0/gui_main.c:297 client/gui-gtk-3.0/gui_main.c:289 #: client/gui-qt/gui_main.cpp:127 client/gui-sdl/gui_main.c:183 #: client/gui-xaw/gui_main.c:265 common/fc_cmdhelp.c:139 tools/mpcli.c:115 -#: tools/mpgui_gtk2.c:581 tools/mpgui_gtk3.c:587 tools/mpgui_qt.cpp:101 +#: tools/mpgui_gtk2.c:576 tools/mpgui_gtk3.c:582 tools/mpgui_qt.cpp:101 #, c-format msgid "Report bugs at %s\n" msgstr "回報臭蟲給 %s\n" @@ -3549,7 +3549,7 @@ msgstr "Shift+Enter" #: client/gui-gtk-2.0/gui_main.c:1347 client/gui-gtk-3.0/gui_main.c:1410 -#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:640 +#: client/gui-qt/menu.cpp:791 client/gui-qt/pages.cpp:633 msgid "?noun:View" msgstr "視圖" @@ -3921,12 +3921,12 @@ msgid "Load Lua Script" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:192 +#: client/gui-gtk-2.0/mapctrl.c:191 client/gui-gtk-3.0/mapctrl.c:191 #: client/gui-qt/mapctrl.cpp:51 msgid "Build New City" msgstr "" -#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:193 +#: client/gui-gtk-2.0/mapctrl.c:192 client/gui-gtk-3.0/mapctrl.c:192 #: client/gui-qt/mapctrl.cpp:52 client/gui-sdl/mapctrl.c:2633 #: client/gui-xaw/mapctrl.c:90 msgid "What should we call our new city?" @@ -3954,8 +3954,8 @@ msgid "Set local options" msgstr "設定本機選項" -#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1493 -#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1577 +#: client/gui-gtk-2.0/menu.c:131 client/gui-gtk-2.0/pages.c:1487 +#: client/gui-gtk-3.0/menu.c:131 client/gui-gtk-3.0/pages.c:1571 #: client/gui-xaw/menu.c:575 data/Freeciv.in:3455 data/Freeciv.in:3464 msgid "Game Settings" msgstr "遊戲選項" @@ -4331,8 +4331,8 @@ msgid "Game/Scenario Properties" msgstr "遊戲/劇情屬性" -#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3307 -#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/menu.c:1555 client/gui-gtk-2.0/pages.c:3301 +#: client/gui-gtk-3.0/menu.c:1543 client/gui-gtk-3.0/pages.c:3392 msgid "Save Scenario" msgstr "儲存劇情" @@ -4689,7 +4689,7 @@ #. TRANS: "version 2.6.0, gui-gtk-2.0 client" #. TRANS: "version 2.6.0, gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:175 client/gui-gtk-3.0/pages.c:180 +#: client/gui-gtk-2.0/pages.c:174 client/gui-gtk-3.0/pages.c:179 #, c-format msgid "%s%s, %s client" msgstr "%s%s，%s 客戶端" @@ -4700,7 +4700,7 @@ #. TRANS: "version 2.6.0 #. * commit: [modified] #. * gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:181 client/gui-gtk-3.0/pages.c:186 +#: client/gui-gtk-2.0/pages.c:180 client/gui-gtk-3.0/pages.c:185 #, fuzzy, c-format msgid "" "%s%s\n" @@ -4708,364 +4708,357 @@ "%s client" msgstr "%s%s，%s 客戶端" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-2.0 client" -#. TRANS: "version 2.6.0 (r25000), gui-gtk-3.0 client" -#: client/gui-gtk-2.0/pages.c:187 client/gui-gtk-3.0/pages.c:192 -#, fuzzy, c-format -msgid "%s%s (%s), %s client" -msgstr "%s%s，%s 客戶端" - -#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 +#: client/gui-gtk-2.0/pages.c:255 client/gui-gtk-3.0/pages.c:317 msgid "Start _New Game" msgstr "開始新遊戲(_N)" -#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 +#: client/gui-gtk-2.0/pages.c:261 client/gui-gtk-3.0/pages.c:323 msgid "Start _Scenario Game" msgstr "開始劇情遊戲(_S)" -#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 +#: client/gui-gtk-2.0/pages.c:267 client/gui-gtk-3.0/pages.c:329 msgid "_Load Saved Game" msgstr "讀取舊檔(_L)" -#: client/gui-gtk-2.0/pages.c:279 client/gui-gtk-3.0/pages.c:341 +#: client/gui-gtk-2.0/pages.c:273 client/gui-gtk-3.0/pages.c:335 msgid "C_onnect to Network Game" msgstr "連接到網路遊戲(_o)" -#: client/gui-gtk-2.0/pages.c:286 client/gui-gtk-3.0/pages.c:348 +#: client/gui-gtk-2.0/pages.c:280 client/gui-gtk-3.0/pages.c:342 msgid "Connect to Gaming _Zone" msgstr "連接到 Gaming _Zone" -#: client/gui-gtk-2.0/pages.c:427 client/gui-gtk-3.0/pages.c:490 +#: client/gui-gtk-2.0/pages.c:421 client/gui-gtk-3.0/pages.c:484 msgid "Select Location to Save" msgstr "選擇位置以儲存" -#: client/gui-gtk-2.0/pages.c:531 client/gui-gtk-2.0/pages.c:2906 -#: client/gui-gtk-2.0/pages.c:3107 client/gui-gtk-3.0/pages.c:594 -#: client/gui-gtk-3.0/pages.c:2981 client/gui-gtk-3.0/pages.c:3198 +#: client/gui-gtk-2.0/pages.c:525 client/gui-gtk-2.0/pages.c:2900 +#: client/gui-gtk-2.0/pages.c:3101 client/gui-gtk-3.0/pages.c:588 +#: client/gui-gtk-3.0/pages.c:2975 client/gui-gtk-3.0/pages.c:3192 msgid "_Browse..." msgstr "瀏覽(_B)……" -#: client/gui-gtk-2.0/pages.c:987 client/gui-gtk-3.0/pages.c:1068 -#: client/gui-qt/pages.cpp:1212 client/gui-sdl/connectdlg.c:937 +#: client/gui-gtk-2.0/pages.c:981 client/gui-gtk-3.0/pages.c:1062 +#: client/gui-qt/pages.cpp:1205 client/gui-sdl/connectdlg.c:937 #: client/gui-xaw/connectdlg.c:444 client/gui-xaw/connectdlg.c:446 msgid "Passwords don't match, enter password." msgstr "密碼不符合，再輸入一次。" -#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 -#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 -#: client/gui-qt/pages.cpp:280 +#: client/gui-gtk-2.0/pages.c:1143 client/gui-gtk-2.0/pages.c:1186 +#: client/gui-gtk-3.0/pages.c:1228 client/gui-gtk-3.0/pages.c:1273 +#: client/gui-qt/pages.cpp:273 msgid "Server Name" msgstr "伺服器名稱" -#: client/gui-gtk-2.0/pages.c:1150 client/gui-gtk-2.0/pages.c:1193 -#: client/gui-gtk-3.0/pages.c:1235 client/gui-gtk-3.0/pages.c:1280 -#: client/gui-qt/pages.cpp:280 client/gui-qt/pages.cpp:337 +#: client/gui-gtk-2.0/pages.c:1144 client/gui-gtk-2.0/pages.c:1187 +#: client/gui-gtk-3.0/pages.c:1229 client/gui-gtk-3.0/pages.c:1274 +#: client/gui-qt/pages.cpp:273 client/gui-qt/pages.cpp:330 #: client/gui-sdl/mapview.c:637 data/Freeciv.in:89 msgid "Port" msgstr "埠口" -#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-2.0/pages.c:1194 -#: client/gui-gtk-3.0/pages.c:1236 client/gui-gtk-3.0/pages.c:1281 -#: client/gui-qt/pages.cpp:280 tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 -#: tools/mpgui_qt.cpp:217 +#: client/gui-gtk-2.0/pages.c:1145 client/gui-gtk-2.0/pages.c:1188 +#: client/gui-gtk-3.0/pages.c:1230 client/gui-gtk-3.0/pages.c:1275 +#: client/gui-qt/pages.cpp:273 tools/mpgui_gtk2.c:465 tools/mpgui_gtk3.c:468 +#: tools/mpgui_qt.cpp:212 msgid "Version" msgstr "版本" -#: client/gui-gtk-2.0/pages.c:1152 client/gui-gtk-2.0/pages.c:1195 -#: client/gui-gtk-3.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1282 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1146 client/gui-gtk-2.0/pages.c:1189 +#: client/gui-gtk-3.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1276 +#: client/gui-qt/pages.cpp:274 msgid "Status" msgstr "狀態" -#: client/gui-gtk-2.0/pages.c:1153 client/gui-gtk-2.0/pages.c:1196 -#: client/gui-gtk-3.0/pages.c:1238 client/gui-gtk-3.0/pages.c:1283 -#: client/gui-qt/pages.cpp:281 client/gui-sdl/connectdlg.c:330 +#: client/gui-gtk-2.0/pages.c:1147 client/gui-gtk-2.0/pages.c:1190 +#: client/gui-gtk-3.0/pages.c:1232 client/gui-gtk-3.0/pages.c:1277 +#: client/gui-qt/pages.cpp:274 client/gui-sdl/connectdlg.c:330 #, fuzzy msgid "?count:Players" msgstr "玩家" -#: client/gui-gtk-2.0/pages.c:1154 client/gui-gtk-2.0/pages.c:1197 -#: client/gui-gtk-3.0/pages.c:1239 client/gui-gtk-3.0/pages.c:1284 +#: client/gui-gtk-2.0/pages.c:1148 client/gui-gtk-2.0/pages.c:1191 +#: client/gui-gtk-3.0/pages.c:1233 client/gui-gtk-3.0/pages.c:1278 msgid "Humans" msgstr "人類" -#: client/gui-gtk-2.0/pages.c:1155 client/gui-gtk-2.0/pages.c:1198 -#: client/gui-gtk-3.0/pages.c:1240 client/gui-gtk-3.0/pages.c:1285 -#: client/gui-qt/pages.cpp:281 +#: client/gui-gtk-2.0/pages.c:1149 client/gui-gtk-2.0/pages.c:1192 +#: client/gui-gtk-3.0/pages.c:1234 client/gui-gtk-3.0/pages.c:1279 +#: client/gui-qt/pages.cpp:274 msgid "Comment" msgstr "註解" -#: client/gui-gtk-2.0/pages.c:1157 client/gui-gtk-3.0/pages.c:1242 +#: client/gui-gtk-2.0/pages.c:1151 client/gui-gtk-3.0/pages.c:1236 msgid "Local _Area Network" msgstr "區域網路(_A)" -#: client/gui-gtk-2.0/pages.c:1200 client/gui-gtk-3.0/pages.c:1287 +#: client/gui-gtk-2.0/pages.c:1194 client/gui-gtk-3.0/pages.c:1281 msgid "Internet _Metaserver" msgstr "網路中介伺服器(_M)" -#: client/gui-gtk-2.0/pages.c:1237 client/gui-gtk-3.0/pages.c:1326 +#: client/gui-gtk-2.0/pages.c:1231 client/gui-gtk-3.0/pages.c:1320 msgid "_Host:" msgstr "主機(_H)：" -#: client/gui-gtk-2.0/pages.c:1254 client/gui-gtk-3.0/pages.c:1341 +#: client/gui-gtk-2.0/pages.c:1248 client/gui-gtk-3.0/pages.c:1335 msgid "_Port:" msgstr "埠口(_P)：" -#: client/gui-gtk-2.0/pages.c:1271 client/gui-gtk-3.0/pages.c:1357 +#: client/gui-gtk-2.0/pages.c:1265 client/gui-gtk-3.0/pages.c:1351 msgid "_Login:" msgstr "登入(_L)：" -#: client/gui-gtk-2.0/pages.c:1289 client/gui-gtk-3.0/pages.c:937 -#: client/gui-gtk-3.0/pages.c:967 client/gui-gtk-3.0/pages.c:979 -#: client/gui-gtk-3.0/pages.c:1374 +#: client/gui-gtk-2.0/pages.c:1283 client/gui-gtk-3.0/pages.c:931 +#: client/gui-gtk-3.0/pages.c:961 client/gui-gtk-3.0/pages.c:973 +#: client/gui-gtk-3.0/pages.c:1368 msgid "Pass_word:" msgstr "密碼(_w)：" -#: client/gui-gtk-2.0/pages.c:1307 client/gui-gtk-3.0/pages.c:1390 +#: client/gui-gtk-2.0/pages.c:1301 client/gui-gtk-3.0/pages.c:1384 msgid "Conf_irm Password:" msgstr "確認密碼(_i)：" -#: client/gui-gtk-2.0/pages.c:1325 client/gui-gtk-3.0/pages.c:1408 -#: client/gui-qt/pages.cpp:283 data/Freeciv.in:81 +#: client/gui-gtk-2.0/pages.c:1319 client/gui-gtk-3.0/pages.c:1402 +#: client/gui-qt/pages.cpp:276 data/Freeciv.in:81 msgid "Host" msgstr "主機" -#: client/gui-gtk-2.0/pages.c:1354 client/gui-gtk-3.0/pages.c:1438 +#: client/gui-gtk-2.0/pages.c:1348 client/gui-gtk-3.0/pages.c:1432 msgid "C_onnect" msgstr "連線(_o)" -#: client/gui-gtk-2.0/pages.c:1697 client/gui-gtk-3.0/pages.c:1767 +#: client/gui-gtk-2.0/pages.c:1691 client/gui-gtk-3.0/pages.c:1761 #, c-format msgid "Connection name: %s" msgstr "連線名稱：%s" -#: client/gui-gtk-2.0/pages.c:1700 client/gui-gtk-3.0/pages.c:1770 +#: client/gui-gtk-2.0/pages.c:1694 client/gui-gtk-3.0/pages.c:1764 #, c-format msgid "Player name: %s" msgstr "玩家名稱：%s" -#: client/gui-gtk-2.0/pages.c:1705 client/gui-gtk-3.0/pages.c:1775 +#: client/gui-gtk-2.0/pages.c:1699 client/gui-gtk-3.0/pages.c:1769 #, c-format msgid "Host: %s" msgstr "主機：%s" -#: client/gui-gtk-2.0/pages.c:1713 client/gui-gtk-3.0/pages.c:1783 +#: client/gui-gtk-2.0/pages.c:1707 client/gui-gtk-3.0/pages.c:1777 msgid "Player/conn info" msgstr "玩家連線資訊" -#: client/gui-gtk-2.0/pages.c:1746 client/gui-gtk-3.0/pages.c:1816 +#: client/gui-gtk-2.0/pages.c:1740 client/gui-gtk-3.0/pages.c:1810 #, c-format msgid "%s info" msgstr "%s 的資訊" -#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-gtk-2.0/pages.c:1749 client/gui-gtk-3.0/pages.c:1819 msgid "Toggle player ready" msgstr "切換玩家待命" -#: client/gui-gtk-2.0/pages.c:1761 client/gui-gtk-3.0/pages.c:1831 -#: client/gui-qt/pages.cpp:1577 +#: client/gui-gtk-2.0/pages.c:1755 client/gui-gtk-3.0/pages.c:1825 +#: client/gui-qt/pages.cpp:1570 msgid "Pick nation" msgstr "挑選民族" -#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-3.0/pages.c:1839 +#: client/gui-gtk-2.0/pages.c:1763 client/gui-gtk-3.0/pages.c:1833 msgid "Observe this player" msgstr "旁觀這名玩家" -#: client/gui-gtk-2.0/pages.c:1776 client/gui-gtk-3.0/pages.c:1846 -#: client/gui-qt/pages.cpp:1567 +#: client/gui-gtk-2.0/pages.c:1770 client/gui-gtk-3.0/pages.c:1840 +#: client/gui-qt/pages.cpp:1560 msgid "Take this player" msgstr "與玩家接棒" -#: client/gui-gtk-2.0/pages.c:1788 client/gui-gtk-3.0/pages.c:1858 +#: client/gui-gtk-2.0/pages.c:1782 client/gui-gtk-3.0/pages.c:1852 msgid "Cut connection" msgstr "切斷連線" -#: client/gui-gtk-2.0/pages.c:1799 client/gui-gtk-3.0/pages.c:1869 -#: client/gui-qt/pages.cpp:1639 +#: client/gui-gtk-2.0/pages.c:1793 client/gui-gtk-3.0/pages.c:1863 +#: client/gui-qt/pages.cpp:1632 msgid "Aitoggle player" msgstr "切換玩家 AI" -#: client/gui-gtk-2.0/pages.c:1807 client/gui-gtk-3.0/pages.c:1877 -#: client/gui-qt/pages.cpp:1559 +#: client/gui-gtk-2.0/pages.c:1801 client/gui-gtk-3.0/pages.c:1871 +#: client/gui-qt/pages.cpp:1552 msgid "Remove player" msgstr "移除玩家" #. TRANS: Give access level to a connection. -#: client/gui-gtk-2.0/pages.c:1823 client/gui-gtk-3.0/pages.c:1893 +#: client/gui-gtk-2.0/pages.c:1817 client/gui-gtk-3.0/pages.c:1887 #, c-format msgid "Give %s access" msgstr "允許 %s 的存取" #. TRANS: e.g., "Put on Team 5" -#: client/gui-gtk-2.0/pages.c:1878 client/gui-gtk-3.0/pages.c:1948 +#: client/gui-gtk-2.0/pages.c:1872 client/gui-gtk-3.0/pages.c:1942 #, c-format msgid "Put on %s" msgstr "加入 %s" -#: client/gui-gtk-2.0/pages.c:2137 client/gui-gtk-3.0/pages.c:2207 +#: client/gui-gtk-2.0/pages.c:2131 client/gui-gtk-3.0/pages.c:2201 msgid "Not _ready" msgstr "還沒好(_r)" -#: client/gui-gtk-2.0/pages.c:2148 client/gui-gtk-2.0/pages.c:2776 -#: client/gui-gtk-3.0/pages.c:2218 client/gui-gtk-3.0/pages.c:2845 +#: client/gui-gtk-2.0/pages.c:2142 client/gui-gtk-2.0/pages.c:2770 +#: client/gui-gtk-3.0/pages.c:2212 client/gui-gtk-3.0/pages.c:2839 msgid "_Ready" msgstr "待命(_R)" -#: client/gui-gtk-2.0/pages.c:2152 client/gui-gtk-2.0/pages.c:2156 -#: client/gui-gtk-3.0/pages.c:2222 client/gui-gtk-3.0/pages.c:2226 +#: client/gui-gtk-2.0/pages.c:2146 client/gui-gtk-2.0/pages.c:2150 +#: client/gui-gtk-3.0/pages.c:2216 client/gui-gtk-3.0/pages.c:2220 msgid "_Start" msgstr "開始遊戲(_S)" -#: client/gui-gtk-2.0/pages.c:2176 client/gui-gtk-3.0/pages.c:2246 +#: client/gui-gtk-2.0/pages.c:2170 client/gui-gtk-3.0/pages.c:2240 #, c-format msgid "_Take %s" msgstr "與 %s 接棒(_T)" -#: client/gui-gtk-2.0/pages.c:2180 client/gui-gtk-2.0/pages.c:2766 -#: client/gui-gtk-3.0/pages.c:2250 client/gui-gtk-3.0/pages.c:2835 +#: client/gui-gtk-2.0/pages.c:2174 client/gui-gtk-2.0/pages.c:2760 +#: client/gui-gtk-3.0/pages.c:2244 client/gui-gtk-3.0/pages.c:2829 msgid "Pick _Nation" msgstr "挑選民族(_N)" -#: client/gui-gtk-2.0/pages.c:2183 client/gui-gtk-3.0/pages.c:2253 +#: client/gui-gtk-2.0/pages.c:2177 client/gui-gtk-3.0/pages.c:2247 msgid "_Take a Player" msgstr "加入戰局(_T)" -#: client/gui-gtk-2.0/pages.c:2191 client/gui-gtk-3.0/pages.c:2261 +#: client/gui-gtk-2.0/pages.c:2185 client/gui-gtk-3.0/pages.c:2255 #, c-format msgid "_Observe %s" msgstr "旁觀 %s(_O)" -#: client/gui-gtk-2.0/pages.c:2196 client/gui-gtk-2.0/pages.c:2771 -#: client/gui-gtk-3.0/pages.c:2266 client/gui-gtk-3.0/pages.c:2840 +#: client/gui-gtk-2.0/pages.c:2190 client/gui-gtk-2.0/pages.c:2765 +#: client/gui-gtk-3.0/pages.c:2260 client/gui-gtk-3.0/pages.c:2834 msgid "_Observe" msgstr "旁觀(_O)" -#: client/gui-gtk-2.0/pages.c:2199 client/gui-gtk-3.0/pages.c:2269 +#: client/gui-gtk-2.0/pages.c:2193 client/gui-gtk-3.0/pages.c:2263 msgid "Do not _observe" msgstr "禁止旁觀(_o)" #. TRANS: "" -#: client/gui-gtk-2.0/pages.c:2329 client/gui-gtk-3.0/pages.c:2399 +#: client/gui-gtk-2.0/pages.c:2323 client/gui-gtk-3.0/pages.c:2393 #: client/gui-xaw/pages.c:248 #, c-format msgid "<%s AI>" msgstr "<%s AI>" -#: client/gui-gtk-2.0/pages.c:2341 client/gui-gtk-3.0/pages.c:2411 -#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1293 +#: client/gui-gtk-2.0/pages.c:2335 client/gui-gtk-3.0/pages.c:2405 +#: client/gui-qt/dialogs.cpp:233 client/gui-qt/pages.cpp:1286 #: client/gui-xaw/pages.c:255 msgid "Random" msgstr "隨機" -#: client/gui-gtk-2.0/pages.c:2415 client/gui-gtk-2.0/pages.c:2472 -#: client/gui-gtk-3.0/pages.c:2485 client/gui-gtk-3.0/pages.c:2542 -#: client/gui-qt/pages.cpp:1364 client/gui-qt/pages.cpp:1394 +#: client/gui-gtk-2.0/pages.c:2409 client/gui-gtk-2.0/pages.c:2466 +#: client/gui-gtk-3.0/pages.c:2479 client/gui-gtk-3.0/pages.c:2536 +#: client/gui-qt/pages.cpp:1357 client/gui-qt/pages.cpp:1387 msgid "Observer" msgstr "觀際員" -#: client/gui-gtk-2.0/pages.c:2497 client/gui-gtk-3.0/pages.c:2567 -#: client/gui-qt/pages.cpp:1411 +#: client/gui-gtk-2.0/pages.c:2491 client/gui-gtk-3.0/pages.c:2561 +#: client/gui-qt/pages.cpp:1404 msgid "Detached" msgstr "已離開" #. TRANS: Keep individual lines short -#: client/gui-gtk-2.0/pages.c:2621 client/gui-gtk-3.0/pages.c:2696 +#: client/gui-gtk-2.0/pages.c:2615 client/gui-gtk-3.0/pages.c:2690 #, fuzzy msgid "" "Number of _Players\n" "(including AI):" msgstr "玩家數量(_P)（抱括 AI）：" -#: client/gui-gtk-2.0/pages.c:2646 client/gui-gtk-3.0/pages.c:2722 +#: client/gui-gtk-2.0/pages.c:2640 client/gui-gtk-3.0/pages.c:2716 msgid "AI Skill _Level:" msgstr "AI 技能等級(_L)：" -#: client/gui-gtk-2.0/pages.c:2672 client/gui-gtk-3.0/pages.c:2737 +#: client/gui-gtk-2.0/pages.c:2666 client/gui-gtk-3.0/pages.c:2731 #: client/gui-qt/fc_client.cpp:886 #, fuzzy msgid "Ruleset:" msgstr "重設" -#: client/gui-gtk-2.0/pages.c:2680 client/gui-gtk-3.0/pages.c:2744 +#: client/gui-gtk-2.0/pages.c:2674 client/gui-gtk-3.0/pages.c:2738 msgid "_More Game Options..." msgstr "更多遊戲選項(_M)……" -#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 +#: client/gui-gtk-2.0/pages.c:2693 client/gui-gtk-3.0/pages.c:2760 msgid "Record" msgstr "記錄" -#: client/gui-gtk-2.0/pages.c:2701 client/gui-gtk-3.0/pages.c:2768 +#: client/gui-gtk-2.0/pages.c:2695 client/gui-gtk-3.0/pages.c:2762 msgid "Rating" msgstr "評價" -#: client/gui-gtk-2.0/pages.c:2703 client/gui-gtk-2.0/unitselect.c:473 -#: client/gui-gtk-3.0/pages.c:2770 client/gui-gtk-3.0/unitselect.c:475 -#: client/gui-qt/pages.cpp:553 client/gui-qt/pages.cpp:1467 +#: client/gui-gtk-2.0/pages.c:2697 client/gui-gtk-2.0/unitselect.c:473 +#: client/gui-gtk-3.0/pages.c:2764 client/gui-gtk-3.0/unitselect.c:475 +#: client/gui-qt/pages.cpp:546 client/gui-qt/pages.cpp:1460 #: tools/mpgui_gtk2.c:267 tools/mpgui_gtk3.c:265 tools/mpgui_qt_worker.cpp:52 msgid "Ready" msgstr "待命" -#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-gtk-2.0/pages.c:2699 client/gui-gtk-3.0/pages.c:2766 msgid "?player:Leader" msgstr "領導人" -#: client/gui-gtk-2.0/pages.c:2711 client/gui-gtk-3.0/pages.c:2778 -#: client/gui-qt/pages.cpp:554 client/plrdlg_common.c:310 +#: client/gui-gtk-2.0/pages.c:2705 client/gui-gtk-3.0/pages.c:2772 +#: client/gui-qt/pages.cpp:547 client/plrdlg_common.c:310 msgid "Team" msgstr "隊伍" -#: client/gui-gtk-2.0/pages.c:2830 client/gui-gtk-3.0/pages.c:2899 -#: client/gui-qt/pages.cpp:431 client/gui-sdl/chatline.c:197 +#: client/gui-gtk-2.0/pages.c:2824 client/gui-gtk-3.0/pages.c:2893 +#: client/gui-qt/pages.cpp:424 client/gui-sdl/chatline.c:197 msgid "Choose Saved Game to Load" msgstr "選擇要載入的遊戲存檔" -#: client/gui-gtk-2.0/pages.c:2886 client/gui-gtk-3.0/pages.c:2960 +#: client/gui-gtk-2.0/pages.c:2880 client/gui-gtk-3.0/pages.c:2954 msgid "Choose Saved Game to _Load:" msgstr "選擇要載入的遊戲存檔（_L）：" -#: client/gui-gtk-2.0/pages.c:2973 client/gui-gtk-3.0/pages.c:3048 -#: client/gui-qt/pages.cpp:492 +#: client/gui-gtk-2.0/pages.c:2967 client/gui-gtk-3.0/pages.c:3042 +#: client/gui-qt/pages.cpp:485 msgid "Choose a Scenario" msgstr "選擇劇情" -#: client/gui-gtk-2.0/pages.c:3054 client/gui-gtk-3.0/pages.c:3131 +#: client/gui-gtk-2.0/pages.c:3048 client/gui-gtk-3.0/pages.c:3125 msgid "Choose a _Scenario:" msgstr "選擇劇情(_S)：" -#: client/gui-gtk-2.0/pages.c:3087 client/gui-gtk-3.0/pages.c:3172 +#: client/gui-gtk-2.0/pages.c:3081 client/gui-gtk-3.0/pages.c:3166 msgid "Filename:" msgstr "檔案名稱：" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 #: client/gui-qt/menu.cpp:436 client/gui-sdl/optiondlg.c:845 msgid "Save Game" msgstr "儲存遊戲" -#: client/gui-gtk-2.0/pages.c:3272 client/gui-gtk-3.0/pages.c:3363 +#: client/gui-gtk-2.0/pages.c:3266 client/gui-gtk-3.0/pages.c:3357 msgid "Saved _Games:" msgstr "儲存的遊戲(_G)：" -#: client/gui-gtk-2.0/pages.c:3273 client/gui-gtk-3.0/pages.c:3364 +#: client/gui-gtk-2.0/pages.c:3267 client/gui-gtk-3.0/pages.c:3358 msgid "Save _Filename:" msgstr "儲存檔案名稱(_F)：" -#: client/gui-gtk-2.0/pages.c:3307 client/gui-gtk-3.0/pages.c:3398 +#: client/gui-gtk-2.0/pages.c:3301 client/gui-gtk-3.0/pages.c:3392 msgid "Saved Sce_narios:" msgstr "儲存的劇情(_n)：" -#: client/gui-gtk-2.0/pages.c:3308 client/gui-gtk-3.0/pages.c:3399 +#: client/gui-gtk-2.0/pages.c:3302 client/gui-gtk-3.0/pages.c:3393 msgid "Save Sc_enario:" msgstr "儲存劇情(_e)：" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Save Map Image" msgstr "儲存地圖映像" -#: client/gui-gtk-2.0/pages.c:3336 client/gui-gtk-3.0/pages.c:3427 +#: client/gui-gtk-2.0/pages.c:3330 client/gui-gtk-3.0/pages.c:3421 msgid "Saved Map _Images:" msgstr "儲存的地圖映像(_I)：" -#: client/gui-gtk-2.0/pages.c:3337 client/gui-gtk-3.0/pages.c:3428 +#: client/gui-gtk-2.0/pages.c:3331 client/gui-gtk-3.0/pages.c:3422 msgid "Save _Map Images:" msgstr "儲存地圖映像(_M)：" @@ -5575,7 +5568,7 @@ msgid "Additional information is available%svia left click on the citizens." msgstr "" -#: client/gui-gtk-3.0/pages.c:951 +#: client/gui-gtk-3.0/pages.c:945 #, fuzzy msgid "New Pass_word:" msgstr "密碼(_w)：" @@ -5616,7 +5609,7 @@ msgstr "改變：" #: client/gui-qt/citydlg.cpp:216 client/gui-qt/menu.cpp:665 -#: client/gui-qt/pages.cpp:472 +#: client/gui-qt/pages.cpp:465 #, fuzzy msgid "Load" msgstr "裝載(_L)" @@ -5885,8 +5878,8 @@ #: client/gui-qt/citydlg.cpp:2798 client/gui-qt/dialogs.cpp:229 #: client/gui-qt/messagedlg.cpp:61 client/gui-qt/optiondlg.cpp:132 -#: client/gui-qt/pages.cpp:358 client/gui-qt/pages.cpp:464 -#: client/gui-qt/pages.cpp:522 client/gui-qt/ratesdlg.cpp:140 +#: client/gui-qt/pages.cpp:351 client/gui-qt/pages.cpp:457 +#: client/gui-qt/pages.cpp:515 client/gui-qt/ratesdlg.cpp:140 #: client/gui-sdl/citydlg.c:526 client/gui-sdl/citydlg.c:1418 #: client/gui-sdl/connectdlg.c:318 client/gui-sdl/connectdlg.c:634 #: client/gui-sdl/connectdlg.c:827 client/gui-sdl/connectdlg.c:1000 @@ -6070,7 +6063,7 @@ msgid_plural "Are you sure you want to disband those %1 units?" msgstr[0] "你確定要離開嗎？" -#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1329 +#: client/gui-qt/dialogs.cpp:1848 client/gui-qt/pages.cpp:1322 #: client/gui-qt/voteinfo_bar.cpp:36 client/gui-sdl/citydlg.c:1212 #: client/gui-sdl/cma_fe.c:344 client/gui-sdl/diplodlg.c:1401 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-sdl/diplomat_dialog.c:1460 @@ -6086,7 +6079,7 @@ msgid "Yes" msgstr "" -#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1331 +#: client/gui-qt/dialogs.cpp:1849 client/gui-qt/pages.cpp:1324 #: client/gui-qt/voteinfo_bar.cpp:37 client/gui-sdl/citydlg.c:1201 #: client/gui-sdl/cma_fe.c:353 client/gui-sdl/diplodlg.c:1391 #: client/gui-sdl/diplomat_dialog.c:1247 client/gui-sdl/diplomat_dialog.c:1470 @@ -6172,13 +6165,13 @@ msgid "This is Qt-client for Freeciv." msgstr "這是 Freeciv 的 Qt 客戶端" -#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1447 +#: client/gui-qt/fc_client.cpp:503 client/gui-qt/pages.cpp:1440 #, fuzzy msgid "Don't Observe" msgstr "禁止旁觀(_o)" -#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:583 -#: client/gui-qt/pages.cpp:1449 client/gui-qt/pages.cpp:1550 +#: client/gui-qt/fc_client.cpp:506 client/gui-qt/pages.cpp:576 +#: client/gui-qt/pages.cpp:1442 client/gui-qt/pages.cpp:1543 #, fuzzy msgid "Observe" msgstr "旁觀(_O)" @@ -6212,7 +6205,7 @@ "\n" msgstr "" -#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:482 +#: client/gui-qt/gui_main.cpp:473 tools/mpgui_qt.cpp:477 #, fuzzy msgid "Quit?" msgstr "結束(_Q)" @@ -6371,9 +6364,9 @@ msgid "Game" msgstr "" -#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:168 +#: client/gui-qt/menu.cpp:421 client/gui-qt/pages.cpp:161 #: client/gui-sdl/mapctrl.c:1655 client/gui-sdl/optiondlg.c:782 -#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:260 +#: client/gui-sdl/optiondlg.c:1348 client/gui-sdl/pages.c:254 #: data/Freeciv.in:1235 msgid "Options" msgstr "" @@ -6402,8 +6395,8 @@ msgid "Leave game" msgstr "儲存遊戲" -#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:168 -#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:274 +#: client/gui-qt/menu.cpp:449 client/gui-qt/pages.cpp:161 +#: client/gui-sdl/optiondlg.c:877 client/gui-sdl/pages.c:268 #: client/gui-xaw/connectdlg.c:341 client/gui-xaw/menu.c:123 #: data/Freeciv.in:136 data/Freeciv.in:3228 msgid "Quit" @@ -6680,7 +6673,7 @@ msgstr "" #. TRANS: Also menu item, but 'headers' should be good enough. -#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1260 +#: client/gui-qt/menu.cpp:800 client/gui-qt/pages.cpp:1253 #: client/gui-qt/plrdlg.cpp:649 client/gui-sdl/plrdlg.c:337 #, fuzzy msgid "?header:Players" @@ -6732,7 +6725,7 @@ msgid "... read more in help" msgstr "" -#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:353 +#: client/gui-qt/optiondlg.cpp:143 client/gui-qt/pages.cpp:346 #: data/Freeciv.in:1671 data/Freeciv.in:1818 data/Freeciv.in:1977 msgid "Refresh" msgstr "" @@ -6742,141 +6735,135 @@ msgstr "" #. TRANS: "version 2.6.0, Qt client" -#: client/gui-qt/pages.cpp:128 +#: client/gui-qt/pages.cpp:126 #, fuzzy, c-format msgid "%s%s, Qt client" msgstr "%s%s，%s 客戶端" #. TRANS: "commit: [modified] " -#: client/gui-qt/pages.cpp:138 tools/mpcli.c:137 +#: client/gui-qt/pages.cpp:136 tools/mpcli.c:136 #, fuzzy, c-format msgid "commit: %s" msgstr "單位：%s" -#: client/gui-qt/pages.cpp:143 +#: client/gui-qt/pages.cpp:141 #, fuzzy msgid "Qt client" msgstr "%s%s，%s 客戶端" -#. TRANS: "version 2.6.0 (r25000), Qt client" -#: client/gui-qt/pages.cpp:147 -#, fuzzy, c-format -msgid "%s%s (%s), Qt client" -msgstr "%s%s，%s 客戶端" - -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start new game" msgstr "開始新遊戲" -#: client/gui-qt/pages.cpp:166 +#: client/gui-qt/pages.cpp:159 #, fuzzy msgid "Start scenario game" msgstr "開始劇情遊戲(_S)" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Load saved game" msgstr "讀取舊檔(_L)" -#: client/gui-qt/pages.cpp:167 +#: client/gui-qt/pages.cpp:160 #, fuzzy msgid "Connect to network game" msgstr "連接到網路遊戲(_o)" -#: client/gui-qt/pages.cpp:337 client/gui-qt/pages.cpp:364 +#: client/gui-qt/pages.cpp:330 client/gui-qt/pages.cpp:357 #: client/gui-sdl/connectdlg.c:626 client/gui-xaw/connectdlg.c:326 #: data/Freeciv.in:125 data/Freeciv.in:2555 msgid "Connect" msgstr "" -#: client/gui-qt/pages.cpp:337 +#: client/gui-qt/pages.cpp:330 #, fuzzy msgid "Login" msgstr "登入(_L)：" -#: client/gui-qt/pages.cpp:338 data/Freeciv.in:105 +#: client/gui-qt/pages.cpp:331 data/Freeciv.in:105 msgid "Password" msgstr "" -#: client/gui-qt/pages.cpp:338 +#: client/gui-qt/pages.cpp:331 #, fuzzy msgid "Confirm Password" msgstr "確認密碼(_i)：" -#: client/gui-qt/pages.cpp:378 +#: client/gui-qt/pages.cpp:371 #, fuzzy msgid "Internet servers:" msgstr "網路中介伺服器(_M)" -#: client/gui-qt/pages.cpp:381 +#: client/gui-qt/pages.cpp:374 #, fuzzy msgid "Local servers:" msgstr "全球觀察員" -#: client/gui-qt/pages.cpp:431 +#: client/gui-qt/pages.cpp:424 msgid "Date" msgstr "" -#: client/gui-qt/pages.cpp:458 client/gui-qt/pages.cpp:516 +#: client/gui-qt/pages.cpp:451 client/gui-qt/pages.cpp:509 #, fuzzy msgid "Browse..." msgstr "瀏覽(_B)……" -#: client/gui-qt/pages.cpp:530 +#: client/gui-qt/pages.cpp:523 #, fuzzy msgid "Load Scenario" msgstr "儲存劇情" -#: client/gui-qt/pages.cpp:553 +#: client/gui-qt/pages.cpp:546 #, fuzzy msgid "Leader" msgstr "領導人(_L)：" -#: client/gui-qt/pages.cpp:571 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 +#: client/gui-qt/pages.cpp:564 client/gui-xaw/menu.c:122 data/Freeciv.in:3226 msgid "Disconnect" msgstr "" -#: client/gui-qt/pages.cpp:589 client/gui-qt/pages.cpp:1475 +#: client/gui-qt/pages.cpp:582 client/gui-qt/pages.cpp:1468 #: client/gui-sdl/chatline.c:800 data/Freeciv.in:3444 msgid "Start" msgstr "" -#: client/gui-qt/pages.cpp:693 +#: client/gui-qt/pages.cpp:686 #, fuzzy msgid "Save Files" msgstr "自然區塊" -#: client/gui-qt/pages.cpp:696 +#: client/gui-qt/pages.cpp:689 #, fuzzy msgid "Open Save File" msgstr "儲存檔案名稱(_F)：" -#: client/gui-qt/pages.cpp:709 +#: client/gui-qt/pages.cpp:702 #, fuzzy msgid "Scenarios Files" msgstr "遊戲/劇情屬性" -#: client/gui-qt/pages.cpp:712 +#: client/gui-qt/pages.cpp:705 #, fuzzy msgid "Open Scenario File" msgstr "儲存劇情" -#: client/gui-qt/pages.cpp:1379 +#: client/gui-qt/pages.cpp:1372 #, fuzzy msgid "Global observers" msgstr "全球觀察員" -#: client/gui-qt/pages.cpp:1456 +#: client/gui-qt/pages.cpp:1449 #, fuzzy msgid "Not ready" msgstr "還沒好(_r)" -#: client/gui-qt/pages.cpp:1592 +#: client/gui-qt/pages.cpp:1585 msgid "Set difficulty" msgstr "" -#: client/gui-qt/pages.cpp:1615 +#: client/gui-qt/pages.cpp:1608 #, fuzzy msgid "Put on team" msgstr "加入 %s" @@ -6984,7 +6971,7 @@ msgid "Back" msgstr "" -#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:204 +#: client/gui-sdl/chatline.c:821 client/gui-sdl/pages.c:198 msgid "Load Game" msgstr "" @@ -8066,44 +8053,38 @@ msgstr "" #. TRANS: Freeciv 2.4.0 -#: client/gui-sdl/pages.c:156 +#: client/gui-sdl/pages.c:154 #, fuzzy, c-format msgid "Freeciv %s" msgstr "Freeciv" -#. TRANS: Freeciv 2.4.0 (r25000) -#: client/gui-sdl/pages.c:159 -#, fuzzy, c-format -msgid "Freeciv %s (%s)" -msgstr "Freeciv 版本 %s（%s）" - #. TRANS: gui-sdl client -#: client/gui-sdl/pages.c:175 +#: client/gui-sdl/pages.c:169 #, fuzzy, c-format msgid "%s client" msgstr "%s%s，%s 客戶端" -#: client/gui-sdl/pages.c:189 +#: client/gui-sdl/pages.c:183 msgid "Start New Game" msgstr "開始新遊戲" -#: client/gui-sdl/pages.c:218 +#: client/gui-sdl/pages.c:212 msgid "Join Game" msgstr "加入遊戲" -#: client/gui-sdl/pages.c:232 +#: client/gui-sdl/pages.c:226 msgid "Join Pubserver" msgstr "加入官方伺服器" -#: client/gui-sdl/pages.c:246 +#: client/gui-sdl/pages.c:240 msgid "Join LAN Server" msgstr "加入區域網路伺服器" -#: client/gui-sdl/pages.c:327 +#: client/gui-sdl/pages.c:321 msgid "SDLClient welcomes you..." msgstr "SDL 客戶端歡迎您……" -#: client/gui-sdl/pages.c:333 client/gui-xaw/gui_main.c:535 +#: client/gui-sdl/pages.c:327 client/gui-xaw/gui_main.c:535 #, fuzzy, c-format msgid "Commit: %s" msgstr "城市：%s" @@ -14581,83 +14562,83 @@ msgid "?unitflag:Hunter" msgstr "直升機" -#: common/version.c:44 +#: common/version.c:40 #, c-format msgid "Freeciv version %s %s" msgstr "Freeciv 版本 %s %s" -#: common/version.c:45 +#: common/version.c:41 msgid "(beta version)" msgstr "（測試版本）" -#: common/version.c:47 common/version.c:50 +#: common/version.c:43 #, c-format msgid "Freeciv version %s (%s)" msgstr "Freeciv 版本 %s（%s）" -#: common/version.c:53 +#: common/version.c:46 #, c-format msgid "Freeciv version %s" msgstr "Freeciv 版本 %s" -#: common/version.c:66 +#: common/version.c:59 msgid "betatest version " msgstr "測試版本 " -#: common/version.c:68 +#: common/version.c:61 msgid "version " msgstr "版本 " -#: common/version.c:136 +#: common/version.c:105 msgid "January" msgstr "一月" -#: common/version.c:137 +#: common/version.c:106 msgid "February" msgstr "二月" -#: common/version.c:138 +#: common/version.c:107 msgid "March" msgstr "三月" -#: common/version.c:139 +#: common/version.c:108 msgid "April" msgstr "四月" -#: common/version.c:140 +#: common/version.c:109 msgid "May" msgstr "五月" -#: common/version.c:141 +#: common/version.c:110 msgid "June" msgstr "六月" -#: common/version.c:142 +#: common/version.c:111 msgid "July" msgstr "七月" -#: common/version.c:143 +#: common/version.c:112 msgid "August" msgstr "八月" -#: common/version.c:144 +#: common/version.c:113 msgid "September" msgstr "九月" -#: common/version.c:145 +#: common/version.c:114 msgid "October" msgstr "十月" -#: common/version.c:146 +#: common/version.c:115 msgid "November" msgstr "十一月" -#: common/version.c:147 +#: common/version.c:116 msgid "December" msgstr "十二月" #. TRANS: No full stop after the URL, could cause confusion. -#: common/version.c:153 +#: common/version.c:122 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -14666,7 +14647,7 @@ "這是測試版本！\n" "Freeciv %s 將會於%s發行，詳情請見 %s" -#: common/version.c:158 +#: common/version.c:127 #, c-format msgid "" "THIS IS A BETA VERSION\n" @@ -14675,7 +14656,7 @@ "這是測試版本！\n" "Freeciv %s 將會於%s發行" -#: common/version.c:176 +#: common/version.c:145 msgid "'Cause civilization should be free!" msgstr "因為《文明》應該是自由的！" @@ -15455,61 +15436,61 @@ msgid "Each tax collector produces two extra gold for your treasury per turn." msgstr "" -#: data/civ1/cities.ruleset:127 data/civ2/cities.ruleset:127 -#: data/classic/cities.ruleset:126 data/experimental/cities.ruleset:128 -#: data/civ2civ3/cities.ruleset:129 data/multiplayer/cities.ruleset:125 +#: data/civ1/cities.ruleset:128 data/civ2/cities.ruleset:128 +#: data/classic/cities.ruleset:127 data/experimental/cities.ruleset:129 +#: data/civ2civ3/cities.ruleset:130 data/multiplayer/cities.ruleset:126 msgid "?citystyle:European" msgstr "歐式" -#: data/civ1/cities.ruleset:136 data/civ2/cities.ruleset:136 -#: data/classic/cities.ruleset:135 data/experimental/cities.ruleset:137 -#: data/civ2civ3/cities.ruleset:138 data/multiplayer/cities.ruleset:134 +#: data/civ1/cities.ruleset:137 data/civ2/cities.ruleset:137 +#: data/classic/cities.ruleset:136 data/experimental/cities.ruleset:138 +#: data/civ2civ3/cities.ruleset:139 data/multiplayer/cities.ruleset:135 msgid "?citystyle:Classical" msgstr "古典" -#: data/civ1/cities.ruleset:145 data/civ2/cities.ruleset:145 -#: data/classic/cities.ruleset:144 data/experimental/cities.ruleset:146 -#: data/civ2civ3/cities.ruleset:147 data/multiplayer/cities.ruleset:143 +#: data/civ1/cities.ruleset:146 data/civ2/cities.ruleset:146 +#: data/classic/cities.ruleset:145 data/experimental/cities.ruleset:147 +#: data/civ2civ3/cities.ruleset:148 data/multiplayer/cities.ruleset:144 msgid "?citystyle:Tropical" msgstr "熱帶" -#: data/civ1/cities.ruleset:154 data/civ2/cities.ruleset:154 -#: data/classic/cities.ruleset:153 data/experimental/cities.ruleset:155 -#: data/civ2civ3/cities.ruleset:156 data/multiplayer/cities.ruleset:152 +#: data/civ1/cities.ruleset:155 data/civ2/cities.ruleset:155 +#: data/classic/cities.ruleset:154 data/experimental/cities.ruleset:156 +#: data/civ2civ3/cities.ruleset:157 data/multiplayer/cities.ruleset:153 msgid "?citystyle:Asian" msgstr "亞洲" -#: data/civ1/cities.ruleset:163 data/civ2/cities.ruleset:163 -#: data/classic/cities.ruleset:162 data/experimental/cities.ruleset:164 -#: data/civ2civ3/cities.ruleset:165 data/multiplayer/cities.ruleset:161 +#: data/civ1/cities.ruleset:164 data/civ2/cities.ruleset:164 +#: data/classic/cities.ruleset:163 data/experimental/cities.ruleset:165 +#: data/civ2civ3/cities.ruleset:166 data/multiplayer/cities.ruleset:162 msgid "?citystyle:Babylonian" msgstr "巴比倫" -#: data/civ1/cities.ruleset:172 data/civ2/cities.ruleset:172 -#: data/classic/cities.ruleset:171 data/experimental/cities.ruleset:173 -#: data/civ2civ3/cities.ruleset:174 data/multiplayer/cities.ruleset:170 +#: data/civ1/cities.ruleset:173 data/civ2/cities.ruleset:173 +#: data/classic/cities.ruleset:172 data/experimental/cities.ruleset:174 +#: data/civ2civ3/cities.ruleset:175 data/multiplayer/cities.ruleset:171 msgid "?citystyle:Celtic" msgstr "塞爾特" -#: data/civ1/cities.ruleset:181 data/civ2/cities.ruleset:181 +#: data/civ1/cities.ruleset:182 data/civ2/cities.ruleset:182 msgid "?citystyle:Renaissance" msgstr "文藝復興" -#: data/civ1/cities.ruleset:192 data/civ2/cities.ruleset:192 -#: data/classic/cities.ruleset:180 data/experimental/cities.ruleset:182 -#: data/civ2civ3/cities.ruleset:183 data/multiplayer/cities.ruleset:179 +#: data/civ1/cities.ruleset:193 data/civ2/cities.ruleset:193 +#: data/classic/cities.ruleset:181 data/experimental/cities.ruleset:183 +#: data/civ2civ3/cities.ruleset:184 data/multiplayer/cities.ruleset:180 msgid "?citystyle:Industrial" msgstr "工業革命" -#: data/civ1/cities.ruleset:203 data/civ2/cities.ruleset:203 -#: data/classic/cities.ruleset:202 data/experimental/cities.ruleset:204 -#: data/civ2civ3/cities.ruleset:205 data/multiplayer/cities.ruleset:201 +#: data/civ1/cities.ruleset:204 data/civ2/cities.ruleset:204 +#: data/classic/cities.ruleset:203 data/experimental/cities.ruleset:205 +#: data/civ2civ3/cities.ruleset:206 data/multiplayer/cities.ruleset:202 msgid "?citystyle:Modern" msgstr "現代" -#: data/civ1/cities.ruleset:214 data/civ2/cities.ruleset:214 -#: data/classic/cities.ruleset:213 data/experimental/cities.ruleset:215 -#: data/civ2civ3/cities.ruleset:216 data/multiplayer/cities.ruleset:212 +#: data/civ1/cities.ruleset:215 data/civ2/cities.ruleset:215 +#: data/classic/cities.ruleset:214 data/experimental/cities.ruleset:216 +#: data/civ2civ3/cities.ruleset:217 data/multiplayer/cities.ruleset:213 msgid "?citystyle:PostModern" msgstr "後現代" @@ -17189,18 +17170,18 @@ #: data/civ2/units.ruleset:1994 data/classic/units.ruleset:38 #: data/classic/units.ruleset:406 data/classic/units.ruleset:451 #: data/classic/units.ruleset:513 data/classic/units.ruleset:1915 -#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2307 +#: data/classic/units.ruleset:2269 data/classic/units.ruleset:2309 #: data/experimental/units.ruleset:41 data/experimental/units.ruleset:420 #: data/experimental/units.ruleset:1941 data/experimental/units.ruleset:2296 -#: data/experimental/units.ruleset:2334 data/civ2civ3/units.ruleset:37 +#: data/experimental/units.ruleset:2336 data/civ2civ3/units.ruleset:37 #: data/civ2civ3/units.ruleset:429 data/civ2civ3/units.ruleset:473 #: data/civ2civ3/units.ruleset:512 data/civ2civ3/units.ruleset:575 #: data/civ2civ3/units.ruleset:2023 data/civ2civ3/units.ruleset:2100 -#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2493 +#: data/civ2civ3/units.ruleset:2455 data/civ2civ3/units.ruleset:2495 #: data/multiplayer/units.ruleset:38 data/multiplayer/units.ruleset:406 #: data/multiplayer/units.ruleset:452 data/multiplayer/units.ruleset:513 #: data/multiplayer/units.ruleset:2013 data/multiplayer/units.ruleset:2355 -#: data/multiplayer/units.ruleset:2393 +#: data/multiplayer/units.ruleset:2395 msgid "green" msgstr "新兵" @@ -17824,14 +17805,14 @@ msgstr "" #: data/civ1/units.ruleset:1307 data/civ2/units.ruleset:2141 -#: data/classic/units.ruleset:2280 data/experimental/units.ruleset:2307 -#: data/civ2civ3/units.ruleset:2466 data/multiplayer/units.ruleset:2366 +#: data/classic/units.ruleset:2282 data/experimental/units.ruleset:2309 +#: data/civ2civ3/units.ruleset:2468 data/multiplayer/units.ruleset:2368 msgid "Barbarian Leader" msgstr "蠻族領袖" #: data/civ1/units.ruleset:1333 data/civ2/units.ruleset:2167 -#: data/classic/units.ruleset:2313 data/experimental/units.ruleset:2340 -#: data/civ2civ3/units.ruleset:2499 data/multiplayer/units.ruleset:2399 +#: data/classic/units.ruleset:2315 data/experimental/units.ruleset:2342 +#: data/civ2civ3/units.ruleset:2501 data/multiplayer/units.ruleset:2401 msgid "" "One Barbarian Leader appears every time there is a barbarian uprising " "somewhere in the world." @@ -19502,9 +19483,9 @@ "territory." msgstr "" -#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2316 -#: data/experimental/units.ruleset:2343 data/civ2civ3/units.ruleset:2502 -#: data/multiplayer/units.ruleset:2402 +#: data/civ2/units.ruleset:2170 data/classic/units.ruleset:2318 +#: data/experimental/units.ruleset:2345 data/civ2civ3/units.ruleset:2504 +#: data/multiplayer/units.ruleset:2404 msgid "" "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." @@ -19846,8 +19827,8 @@ "Each tax collector produces three extra gold for your treasury per turn." msgstr "" -#: data/classic/cities.ruleset:191 data/experimental/cities.ruleset:193 -#: data/civ2civ3/cities.ruleset:194 data/multiplayer/cities.ruleset:190 +#: data/classic/cities.ruleset:192 data/experimental/cities.ruleset:194 +#: data/civ2civ3/cities.ruleset:195 data/multiplayer/cities.ruleset:191 msgid "?citystyle:ElectricAge" msgstr "電力時代" @@ -20220,13 +20201,18 @@ msgid "This is you. If you lose this unit, you lose the game. So don't." msgstr "" -#: data/classic/units.ruleset:2322 data/experimental/units.ruleset:2349 -#: data/civ2civ3/units.ruleset:2508 data/multiplayer/units.ruleset:2408 +#: data/classic/units.ruleset:2277 data/experimental/units.ruleset:2304 +#: data/civ2civ3/units.ruleset:2463 data/multiplayer/units.ruleset:2363 +msgid "Won't unleash barbarians from huts." +msgstr "" + +#: data/classic/units.ruleset:2324 data/experimental/units.ruleset:2351 +#: data/civ2civ3/units.ruleset:2510 data/multiplayer/units.ruleset:2410 msgid "AWACS" msgstr "空中預警管制機" -#: data/classic/units.ruleset:2348 data/experimental/units.ruleset:2375 -#: data/civ2civ3/units.ruleset:2534 data/multiplayer/units.ruleset:2434 +#: data/classic/units.ruleset:2350 data/experimental/units.ruleset:2377 +#: data/civ2civ3/units.ruleset:2536 data/multiplayer/units.ruleset:2436 msgid "" "The AWACS (Airborne Warning and Control System) is an airplane with an " "advanced radar that can determine the location of enemy units over a wide " @@ -26821,19 +26807,19 @@ #. TRANS: Unknown modpack type #: tools/mpcli.c:67 tools/mpgui_gtk2.c:381 tools/mpgui_gtk3.c:381 -#: tools/mpgui_qt.cpp:379 +#: tools/mpgui_qt.cpp:374 msgid "?" msgstr "" #. TRANS: License of modpack is not known #: tools/mpcli.c:74 tools/mpgui_gtk2.c:388 tools/mpgui_gtk3.c:388 -#: tools/mpgui_qt.cpp:386 +#: tools/mpgui_qt.cpp:381 msgid "?license:Unknown" msgstr "未知" #: tools/mpcli.c:79 tools/mpgui_gtk2.c:235 tools/mpgui_gtk2.c:393 -#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:344 -#: tools/mpgui_qt.cpp:391 +#: tools/mpgui_gtk3.c:234 tools/mpgui_gtk3.c:393 tools/mpgui_qt.cpp:339 +#: tools/mpgui_qt.cpp:386 msgid "Not installed" msgstr "" @@ -26887,11 +26873,11 @@ msgid "Freeciv modpack installer (command line version)" msgstr "" -#: tools/mpcli.c:153 +#: tools/mpcli.c:149 msgid "Modpack installed successfully" msgstr "" -#: tools/mpcli.c:155 +#: tools/mpcli.c:151 #, c-format msgid "Modpack install failed: %s" msgstr "" @@ -26923,14 +26909,14 @@ msgid "Automatically install modpack from a given URL" msgstr "" -#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:478 +#: tools/mpgui_gtk2.c:106 tools/mpgui_gtk3.c:106 tools/mpgui_qt.cpp:473 #, fuzzy msgid "" "Modpack installation in progress.\n" "Are you sure you want to quit?" msgstr "你確定要離開嗎？" -#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:309 +#: tools/mpgui_gtk2.c:291 tools/mpgui_gtk3.c:289 tools/mpgui_qt.cpp:304 msgid "Another download already active" msgstr "" @@ -26938,58 +26924,58 @@ msgid "Failed to start downloader" msgstr "" -#: tools/mpgui_gtk2.c:451 tools/mpgui_gtk3.c:454 tools/mpgui_qt.cpp:200 +#: tools/mpgui_gtk2.c:450 tools/mpgui_gtk3.c:453 tools/mpgui_qt.cpp:199 #, c-format msgid "" "%s%s\n" "commit: %s" msgstr "" -#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:470 tools/mpgui_gtk3.c:473 tools/mpgui_qt.cpp:213 msgid "Installed" msgstr "" -#: tools/mpgui_gtk2.c:480 tools/mpgui_gtk3.c:483 tools/mpgui_qt.cpp:218 +#: tools/mpgui_gtk2.c:475 tools/mpgui_gtk3.c:478 tools/mpgui_qt.cpp:213 msgid "?modpack:Type" msgstr "" -#: tools/mpgui_gtk2.c:486 tools/mpgui_gtk3.c:489 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:481 tools/mpgui_gtk3.c:484 tools/mpgui_qt.cpp:214 msgid "Subtype" msgstr "" #. TRANS: noun -#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:219 +#: tools/mpgui_gtk2.c:488 tools/mpgui_gtk3.c:491 tools/mpgui_qt.cpp:214 msgid "License" msgstr "許可證" -#: tools/mpgui_gtk2.c:498 tools/mpgui_gtk3.c:501 tools/mpgui_qt.cpp:220 +#: tools/mpgui_gtk2.c:493 tools/mpgui_gtk3.c:496 tools/mpgui_qt.cpp:215 msgid "URL" msgstr "網址" -#: tools/mpgui_gtk2.c:504 tools/mpgui_gtk3.c:507 tools/mpgui_qt.cpp:187 +#: tools/mpgui_gtk2.c:499 tools/mpgui_gtk3.c:502 tools/mpgui_qt.cpp:187 msgid "Install modpack" msgstr "" -#: tools/mpgui_gtk2.c:510 tools/mpgui_gtk3.c:515 tools/mpgui_qt.cpp:184 +#: tools/mpgui_gtk2.c:505 tools/mpgui_gtk3.c:510 tools/mpgui_qt.cpp:184 msgid "Modpack URL" msgstr "" -#: tools/mpgui_gtk2.c:527 tools/mpgui_gtk3.c:532 tools/mpgui_qt.cpp:259 +#: tools/mpgui_gtk2.c:522 tools/mpgui_gtk3.c:527 tools/mpgui_qt.cpp:254 msgid "Select modpack to install" msgstr "" -#: tools/mpgui_gtk2.c:577 tools/mpgui_gtk3.c:583 +#: tools/mpgui_gtk2.c:572 tools/mpgui_gtk3.c:578 msgid "" "This modpack installer accepts the standard Gtk command-line options\n" "after '--'. See the Gtk documentation.\n" "\n" msgstr "" -#: tools/mpgui_gtk2.c:600 +#: tools/mpgui_gtk2.c:595 msgid "Freeciv modpack installer (gtk2)" msgstr "" -#: tools/mpgui_gtk3.c:606 +#: tools/mpgui_gtk3.c:601 msgid "Freeciv modpack installer (gtk3)" msgstr "" @@ -27253,198 +27239,198 @@ msgid "A poorly-named city" msgstr "" -#: server/citytools.c:599 +#: server/citytools.c:603 #, c-format msgid "Changed homecity of %s to %s." msgstr "" #. TRANS: Americans ... Leader -#: server/citytools.c:628 +#: server/citytools.c:632 #, c-format msgid "The %s already have a %s. Can't transfer yours." msgstr "" -#: server/citytools.c:647 +#: server/citytools.c:651 #, c-format msgid "Transferred %s in %s from %s to %s." msgstr "" -#: server/citytools.c:661 +#: server/citytools.c:665 #, c-format msgid "Transferred %s from %s to %s." msgstr "" #. TRANS: Polish Destroyer ... German -#: server/citytools.c:675 +#: server/citytools.c:679 #, c-format msgid "%s %s lost in transfer to %s %s" msgstr "" -#: server/citytools.c:805 +#: server/citytools.c:809 #, c-format msgid "%s lost along with control of %s." msgstr "" #. TRANS: ... -#: server/citytools.c:1024 +#: server/citytools.c:1028 #, c-format msgid "A replacement %s was built in %s." msgstr "" -#: server/citytools.c:1142 +#: server/citytools.c:1146 #, c-format msgid "You already had a city called %s. The city was renamed to %s." msgstr "" -#: server/citytools.c:1246 +#: server/citytools.c:1250 #, c-format msgid "The people in %s are stunned by your technological insight!" msgstr "" -#: server/citytools.c:1252 server/citytools.c:1265 +#: server/citytools.c:1256 server/citytools.c:1269 #, c-format msgid "Workers spontaneously gather and upgrade %s with %s." msgstr "" -#: server/citytools.c:1257 +#: server/citytools.c:1261 #, c-format msgid "Workers spontaneously gather and upgrade %s roads." msgstr "" -#: server/citytools.c:1270 +#: server/citytools.c:1274 #, c-format msgid "Workers spontaneously gather and upgrade %s bases." msgstr "" -#: server/citytools.c:1586 +#: server/citytools.c:1590 #, c-format msgid "You have founded %s." msgstr "" -#: server/citytools.c:1673 +#: server/citytools.c:1677 #, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "" -#: server/citytools.c:1685 +#: server/citytools.c:1689 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "" -#: server/citytools.c:1718 +#: server/citytools.c:1722 #, c-format msgid "" "When %s was disbanded your %s in %s was trapped, and it was therefore lost." msgstr "" -#: server/citytools.c:1903 +#: server/citytools.c:1907 #, c-format msgid "You destroy %s completely." msgstr "" -#: server/citytools.c:1906 +#: server/citytools.c:1910 #, c-format msgid "%s has been destroyed by %s." msgstr "" -#: server/citytools.c:1934 +#: server/citytools.c:1938 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" msgstr[0] "" -#: server/citytools.c:1941 +#: server/citytools.c:1945 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." msgstr[0] "" -#: server/citytools.c:1950 +#: server/citytools.c:1954 #, c-format msgid "You conquer %s." msgstr "" -#: server/citytools.c:1953 +#: server/citytools.c:1957 #, c-format msgid "%s conquered %s." msgstr "" -#: server/citytools.c:1960 +#: server/citytools.c:1964 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." msgstr[0] "" -#: server/citytools.c:1967 +#: server/citytools.c:1971 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." msgstr[0] "" -#: server/citytools.c:1976 +#: server/citytools.c:1980 #, c-format msgid "You have liberated %s!" msgstr "" -#: server/citytools.c:1979 +#: server/citytools.c:1983 #, c-format msgid "%s liberated %s." msgstr "" -#: server/citytools.c:2550 +#: server/citytools.c:2554 #, c-format msgid "Trade between %s and %s lost along with city." msgstr "" -#: server/citytools.c:2555 +#: server/citytools.c:2559 #, c-format msgid "Trade route between %s and %s canceled." msgstr "" #. TRANS: "...between Spanish city Madrid and Paris..." -#: server/citytools.c:2563 +#: server/citytools.c:2567 #, c-format msgid "Trade between %s city %s and %s lost along with their city." msgstr "" -#: server/citytools.c:2571 +#: server/citytools.c:2575 #, c-format msgid "Sorry, the %s canceled the trade route from %s to your city %s." msgstr "" #. TRANS: "...from Paris to Spanish city Madrid." -#: server/citytools.c:2577 +#: server/citytools.c:2581 #, c-format msgid "We canceled the trade route from %s to %s city %s." msgstr "" -#: server/citytools.c:2823 +#: server/citytools.c:2827 msgid " from the worklist" msgstr "" #. TRANS: " is building ." -#: server/citytools.c:2835 +#: server/citytools.c:2839 #, c-format msgid "%s is building %s%s." msgstr "" -#: server/citytools.c:3004 +#: server/citytools.c:3008 #, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." msgstr[0] "" -#: server/citytools.c:3138 +#: server/citytools.c:3142 #, c-format msgid "The size of the city map of %s is %s." msgstr "" -#: server/citytools.c:3140 +#: server/citytools.c:3144 msgid "increased" msgstr "" -#: server/citytools.c:3141 +#: server/citytools.c:3145 msgid "reduced" msgstr "" @@ -27690,95 +27676,96 @@ msgid "The %s have started building a spaceship!" msgstr "" -#: server/cityturn.c:1781 +#. TRANS: city ... utype ... size ... pop_cost +#: server/cityturn.c:1782 #, c-format -msgid "%s can't build %s yet." +msgid "%s can't build %s yet. (city size: %d, unit population cost: %d)" msgstr "" #. TRANS: is finished building . -#: server/cityturn.c:1820 +#: server/cityturn.c:1823 #, c-format msgid "%s is finished building %s." msgstr "" #. TRANS: " cost... shrinks..." #. * Plural in "%d population", not "size %d". -#: server/cityturn.c:1829 +#: server/cityturn.c:1832 #, c-format msgid "%s cost %d population. %s shrinks to size %d." msgid_plural "%s cost %d population. %s shrinks to size %d." msgstr[0] "" -#: server/cityturn.c:1914 +#: server/cityturn.c:1917 #, c-format msgid "Can't afford to maintain %s in %s, building sold!" msgstr "" -#: server/cityturn.c:1997 +#: server/cityturn.c:2000 #, c-format msgid "Not enough gold. %s disbanded." msgstr "" -#: server/cityturn.c:2240 server/cityturn.c:2979 +#: server/cityturn.c:2243 server/cityturn.c:2982 #, c-format msgid "Pollution near %s." msgstr "" -#: server/cityturn.c:2405 +#: server/cityturn.c:2408 #, c-format msgid "Celebrations in your honor in %s." msgstr "" -#: server/cityturn.c:2411 +#: server/cityturn.c:2414 #, c-format msgid "Celebrations canceled in %s." msgstr "" -#: server/cityturn.c:2428 +#: server/cityturn.c:2431 #, c-format msgid "%s has been struck by a plague! Population lost!" msgstr "" -#: server/cityturn.c:2474 +#: server/cityturn.c:2477 #, c-format msgid "Civil disorder in %s." msgstr "" -#: server/cityturn.c:2478 +#: server/cityturn.c:2481 #, c-format msgid "CIVIL DISORDER CONTINUES in %s." msgstr "" -#: server/cityturn.c:2484 +#: server/cityturn.c:2487 #, c-format msgid "Order restored in %s." msgstr "" -#: server/cityturn.c:2495 +#: server/cityturn.c:2498 #, c-format msgid "The people have overthrown your %s, your country is in turmoil." msgstr "" -#: server/cityturn.c:2537 +#: server/cityturn.c:2540 #, c-format msgid "%s can't build %s yet, and we can't disband our only city." msgstr "" #. TRANS: " is disbanded into Settler." -#: server/cityturn.c:2566 +#: server/cityturn.c:2569 #, c-format msgid "%s is disbanded into %s." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2763 +#: server/cityturn.c:2766 #, c-format msgid "" "Migrants from %s can't go to %s because there is not enough food available!" msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2770 +#: server/cityturn.c:2773 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because there is not enough food " @@ -27786,7 +27773,7 @@ msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2775 +#: server/cityturn.c:2778 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because there is not enough food " @@ -27794,91 +27781,91 @@ msgstr "" #. TRANS: From to . -#: server/cityturn.c:2790 +#: server/cityturn.c:2793 #, c-format msgid "" "Migrants from %s can't go to %s because it needs an improvement to grow!" msgstr "" #. TRANS: From to of . -#: server/cityturn.c:2797 +#: server/cityturn.c:2800 #, c-format msgid "" "Migrants from %s can't go to %s (%s) because it needs an improvement to grow!" msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2802 +#: server/cityturn.c:2805 #, c-format msgid "" "Migrants from %s (%s) can't go to %s because it needs an improvement to grow!" msgstr "" -#: server/cityturn.c:2844 +#: server/cityturn.c:2847 #, c-format msgid "%s was disbanded by its citizens." msgstr "" #. TRANS: From to . -#: server/cityturn.c:2882 +#: server/cityturn.c:2885 #, c-format msgid "Migrants from %s moved to %s in search of a better life." msgstr "" #. TRANS: From to (). -#: server/cityturn.c:2888 +#: server/cityturn.c:2891 #, c-format msgid "Migrants from %s moved to %s (%s) in search of a better life." msgstr "" #. TRANS: From () to . -#: server/cityturn.c:2893 +#: server/cityturn.c:2896 #, c-format msgid "Migrants from %s (%s) moved to %s in search of a better life." msgstr "" #. TRANS: Disasters such as Earthquake -#: server/cityturn.c:2973 +#: server/cityturn.c:2976 #, c-format msgid "%s was hit by %s." msgstr "" -#: server/cityturn.c:2986 +#: server/cityturn.c:2989 #, fuzzy, c-format msgid "Fallout near %s." msgstr "放射性落塵率：%d%%" #. TRANS: "Nuclear Accident ... Montreal." -#: server/cityturn.c:2998 +#: server/cityturn.c:3001 #, fuzzy, c-format msgid "%s causes population loss in %s." msgstr "一些人口損失。" #. TRANS: second %s is the name of a city improvement -#: server/cityturn.c:3020 +#: server/cityturn.c:3023 #, fuzzy, c-format msgid "%s destroys %s in %s." msgstr "%s 被摧毀了。" #. TRANS: %s is a city name -#: server/cityturn.c:3033 +#: server/cityturn.c:3036 #, c-format msgid "All stored food destroyed in %s." msgstr "" #. TRANS: "Production of Colossus in Rhodes destroyed." -#: server/cityturn.c:3047 +#: server/cityturn.c:3050 #, fuzzy, c-format msgid "Production of %s in %s destroyed." msgstr "產品工作線已空" -#: server/cityturn.c:3215 +#: server/cityturn.c:3218 #, c-format msgid "Citizens of %s are thinking about migrating to %s for a better life." msgstr "" #. TRANS: to (). -#: server/cityturn.c:3237 +#: server/cityturn.c:3240 #, c-format msgid "" "Citizens of %s are thinking about migrating to %s (%s) for a better life." @@ -29518,32 +29505,32 @@ msgid "Your %s was captured after completing the mission." msgstr "" -#: server/diplomats.c:1413 +#: server/diplomats.c:1415 #, c-format msgid "You have caused an incident while bribing the %s %s." msgstr "" -#: server/diplomats.c:1418 +#: server/diplomats.c:1420 #, c-format msgid "%s has caused an incident while bribing your %s." msgstr "" -#: server/diplomats.c:1424 +#: server/diplomats.c:1426 #, c-format msgid "You have caused an incident while attempting to steal tech from %s." msgstr "" -#: server/diplomats.c:1428 +#: server/diplomats.c:1430 #, c-format msgid "%s has caused an incident while attempting to steal tech from you." msgstr "" -#: server/diplomats.c:1434 +#: server/diplomats.c:1436 #, c-format msgid "You have caused an incident while inciting a revolt in %s." msgstr "" -#: server/diplomats.c:1438 +#: server/diplomats.c:1440 #, c-format msgid "The %s have caused an incident while inciting a revolt in %s." msgstr "" @@ -29861,19 +29848,19 @@ msgid "The turn timeout is smaller than zero, fixing at zero." msgstr "" -#: server/generator/mapgen.c:1552 +#: server/generator/mapgen.c:1553 msgid "The server couldn't allocate starting positions." msgstr "" -#: server/generator/mapgen.c:2192 +#: server/generator/mapgen.c:2193 msgid "High landmass - this may take a few seconds." msgstr "" -#: server/generator/mapgen.c:2472 +#: server/generator/mapgen.c:2473 msgid "Generator 3 didn't place all big islands." msgstr "" -#: server/generator/mapgen.c:2501 +#: server/generator/mapgen.c:2502 #, c-format msgid "Generator 3 left %li landmass unplaced." msgstr "" @@ -30033,12 +30020,12 @@ "bases." msgstr "" -#: server/maphand.c:1746 +#: server/maphand.c:1750 #, c-format msgid "Moved your %s due to changing terrain." msgstr "" -#: server/maphand.c:1763 +#: server/maphand.c:1767 #, c-format msgid "Disbanded your %s due to changing terrain." msgstr "" @@ -30682,8 +30669,8 @@ "risk." msgstr "" -#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2084 -#: server/srv_main.c:2089 +#: server/savegame2.c:3509 server/savegame.c:4290 server/srv_main.c:2123 +#: server/srv_main.c:2128 #, c-format msgid "%s has been added as %s level AI-controlled player (%s)." msgstr "%s 以%s級 AI 操作玩家的身份加入（%s）" @@ -32984,136 +32971,143 @@ msgid "The cease-fire with %s has run out. You are now at war with the %s." msgstr "" -#: server/srv_main.c:778 +#: server/srv_main.c:788 server/srv_main.c:798 +#, c-format +msgid "" +"The cease-fire between %s and %s has run out. They are at war. You cancel " +"your alliance with %s." +msgstr "" + +#: server/srv_main.c:808 #, c-format msgid "" "The cease-fire between %s and %s has run out. They are at war. You cancel " "your alliance with both." msgstr "" -#: server/srv_main.c:1100 +#: server/srv_main.c:1139 msgid "Automatically placed spaceship parts that were still not placed." msgstr "" -#: server/srv_main.c:1328 server/srv_main.c:1331 +#: server/srv_main.c:1367 server/srv_main.c:1370 #, c-format msgid "Unsupported compression type %d." msgstr "" -#: server/srv_main.c:1361 +#: server/srv_main.c:1400 #, c-format msgid "Failed saving game as %s" msgstr "" -#: server/srv_main.c:1364 +#: server/srv_main.c:1403 #, c-format msgid "Game saved as %s" msgstr "" -#: server/srv_main.c:1420 +#: server/srv_main.c:1459 msgid "The game is already running." msgstr "" -#: server/srv_main.c:1428 +#: server/srv_main.c:1467 #, c-format msgid "%s lost control cmdlevel on game start. Use voting from now on." msgstr "" -#: server/srv_main.c:1436 +#: server/srv_main.c:1475 msgid "Starting game." msgstr "" -#: server/srv_main.c:1536 +#: server/srv_main.c:1575 #, c-format msgid "request for unknown report (type %d)" msgstr "" -#: server/srv_main.c:1626 +#: server/srv_main.c:1665 #, c-format msgid "Warning: rejecting old client %s" msgstr "" -#: server/srv_main.c:1636 +#: server/srv_main.c:1675 msgid "" "Your client is too old. To use this server, please upgrade your client to a " "Freeciv 2.2 or later." msgstr "" -#: server/srv_main.c:1694 +#: server/srv_main.c:1733 msgid "You are not allowed to edit." msgstr "" -#: server/srv_main.c:1901 +#: server/srv_main.c:1940 #, c-format msgid "%s nation is not available for user selection." msgstr "" -#: server/srv_main.c:1907 +#: server/srv_main.c:1946 #, c-format msgid "%s nation is already in use." msgstr "" -#: server/srv_main.c:1923 +#: server/srv_main.c:1962 #, c-format msgid "%s is the %s ruler %s." msgstr "" -#: server/srv_main.c:1998 +#: server/srv_main.c:2037 #, c-format msgid "Waiting to start game: %d out of %d players are ready to start." msgstr "" -#: server/srv_main.c:2024 +#: server/srv_main.c:2063 msgid "requested more than 'maxplayers' setting" msgstr "" -#: server/srv_main.c:2031 +#: server/srv_main.c:2070 msgid "" "not enough playable nations in this nation set (see 'nationset' setting)" msgstr "" -#: server/srv_main.c:2034 +#: server/srv_main.c:2073 msgid "not enough playable nations" msgstr "" -#: server/srv_main.c:2377 server/srv_main.c:2381 +#: server/srv_main.c:2416 server/srv_main.c:2420 #, c-format msgid "%s rules the %s." msgstr "" -#: server/srv_main.c:2545 +#: server/srv_main.c:2584 msgid "" "This freeciv-server program has player authentication support, but it's " "currently not in use." msgstr "" -#: server/srv_main.c:2614 +#: server/srv_main.c:2653 #, c-format msgid "Sending info to metaserver <%s>." msgstr "" -#: server/srv_main.c:2618 +#: server/srv_main.c:2657 msgid "Not starting without explicitly requested metaserver connection." msgstr "" -#: server/srv_main.c:2641 +#: server/srv_main.c:2680 msgid "The game is over..." msgstr "" -#: server/srv_main.c:2750 +#: server/srv_main.c:2789 msgid "Failed to create suitable map, retrying with another mapseed" msgstr "" -#: server/srv_main.c:2783 +#: server/srv_main.c:2822 msgid "Cannot create suitable map with given settings." msgstr "" -#: server/srv_main.c:2806 server/srv_main.c:2810 +#: server/srv_main.c:2845 server/srv_main.c:2849 #, fuzzy, c-format msgid "Setting '%s' has been adjusted from %s to %s." msgstr "終端機：「%s」被設為 %s。" -#: server/srv_main.c:3004 +#: server/srv_main.c:3043 #, c-format msgid "Now accepting new client connections on port %d." msgstr "" @@ -34869,56 +34863,56 @@ msgid "%s acquire %s as a result of learning %s." msgstr "" -#: server/techtools.c:546 +#: server/techtools.c:550 #, c-format msgid "Insufficient science output. We lost Future Tech. %d." msgstr "" -#: server/techtools.c:558 +#: server/techtools.c:562 #, c-format msgid "Insufficient science output. We lost %s." msgstr "" -#: server/techtools.c:699 +#: server/techtools.c:703 #, c-format msgid "" "The required technology for our government '%s' was lost. The citizens have " "started a revolution into '%s'." msgstr "" -#: server/techtools.c:714 +#: server/techtools.c:718 #, c-format msgid "" "The required technology for our new government '%s' was lost. The citizens " "chose '%s' as new target government." msgstr "" -#: server/techtools.c:741 server/techtools.c:754 +#: server/techtools.c:745 server/techtools.c:758 #, c-format msgid "%s can't build %s. The required technology was lost." msgstr "" -#: server/techtools.c:923 +#: server/techtools.c:927 #, c-format msgid "Technology goal is %s." msgstr "科技目標為%s。" -#: server/techtools.c:1136 +#: server/techtools.c:1140 #, c-format msgid "You steal %s from the %s." msgstr "你從 %2$s 那竊取了%1$s。" -#: server/techtools.c:1141 +#: server/techtools.c:1145 #, c-format msgid "The %s stole %s from you!" msgstr "%s 從你那竊取了%s！" -#: server/techtools.c:1146 +#: server/techtools.c:1150 #, c-format msgid "The %s have stolen %s from the %s." msgstr "" -#: server/techtools.c:1264 +#: server/techtools.c:1268 #, c-format msgid "Too bad! You made a mistake transferring the tech %s and lost it." msgstr "" @@ -35786,6 +35780,18 @@ msgid "error %d (compiled without strerror)" msgstr "" +#, fuzzy +#~ msgid "%s%s (%s), %s client" +#~ msgstr "%s%s，%s 客戶端" + +#, fuzzy +#~ msgid "%s%s (%s), Qt client" +#~ msgstr "%s%s，%s 客戶端" + +#, fuzzy +#~ msgid "Freeciv %s (%s)" +#~ msgstr "Freeciv 版本 %s（%s）" + #~ msgid "Ruleset _Version:" #~ msgstr "規則版本(_V)：" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ar.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ar.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ar.po freeciv-2.5.8/translations/nations/ar.po --- freeciv-2.5.7/translations/nations/ar.po 2017-05-13 12:08:08.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ar.po 2017-08-12 11:54:54.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-10 18:00+0300\n" "Last-Translator: Ahmad M. Zawawi \n" "Language-Team: Arabic \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/bg.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/bg.gmo differ diff -Nru freeciv-2.5.7/translations/nations/bg.po freeciv-2.5.8/translations/nations/bg.po --- freeciv-2.5.7/translations/nations/bg.po 2017-05-13 12:08:08.000000000 +0000 +++ freeciv-2.5.8/translations/nations/bg.po 2017-08-12 11:54:54.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: freeciv 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-06-10 00:52+0200\n" "Last-Translator: Bogdan Marinov \n" "Language-Team: Bulgarian\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ca.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ca.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ca.po freeciv-2.5.8/translations/nations/ca.po --- freeciv-2.5.7/translations/nations/ca.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ca.po 2017-08-12 11:54:54.000000000 +0000 @@ -6,21 +6,21 @@ # David , 2003. # Joan Creus , 2007, 2008, 2009, 2010, 2011. # David , 2007. -# Joan Creus , 2011, 2012, 2013, 2014, 2016. +# Joan Creus , 2011, 2012, 2013, 2014, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" -"PO-Revision-Date: 2016-07-28 16:26+0200\n" -"Last-Translator: \n" -"Language-Team: Catalan \n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-02 00:18-0800\n" +"Last-Translator: Joan Creus \n" +"Language-Team: Catalan \n" "Language: ca\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-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 2.0\n" #: data/nation/abkhaz.ruleset:3 msgid "Abkhaz" @@ -1384,7 +1384,7 @@ "politics was dominated by Juan Peron and his charismatic wife Eva \"Evita\" " "Peron." msgstr "" -"Argentina està situada a la costa sud-est de Sudamèrica. Des de la seva " +"Argentina està situada a la costa sud-est de Sud-amèrica. Des de la seva " "independència d'Espanya el 1816, ha sofert diversos conflictes interns i " "externs. Durant les dècades després de la Segona Guerra Mundial, la política " "del país va ser dominada per Juan Perón i la seva carismàtica muller Eva " @@ -2607,7 +2607,7 @@ "democratic rule in the 1980s. In 2006 Evo Morales became the country's first " "indigenous president." msgstr "" -"Bolívia és un país interior de Sudamèrica amb una tradició indígena " +"Bolívia és un país interior de Sud-amèrica amb una tradició indígena " "considerable. El país s'anomena així en honor de Simón Bolívar. Independent " "des de 1825, el país era molt inestable i va perdre la seva sortida al " "Pacífic contra Xile. La guerra del Chaco entre 1932 i 1936 contra el " @@ -3567,10 +3567,10 @@ "remains one of the poorest countries of the world. From 1982 to 1990 Hissene " "Habre led a notoriously brutal dictatorship." msgstr "" -"El Txad és un país continental de l'Àfrica. Havia estat el centre de " -"l'Imperi Kanem-Bornu, i fou colonitzat per França el 1900. Independent des " -"de 1960, el Txad continua sent un dels països més pobres del món. Des de " -"1982 fins a 1990, Hissene Habre va dirigir una dictadura brutal." +"El Txad és un país interior de l'Àfrica. Havia estat el centre de l'Imperi " +"Kanem-Bornu, i fou colonitzat per França el 1900. Independent des de 1960, " +"el Txad continua sent un dels països més pobres del món. Des de 1982 fins a " +"1990, Hissene Habre va dirigir una dictadura brutal." #: data/nation/cham.ruleset:3 msgid "Cham" @@ -3722,8 +3722,8 @@ "century. Often having been more stable and prosperous than its neighbors, " "Chile currently is the most developed country of Latin America." msgstr "" -"Xile està situat a la costa sudoccidental de Sudamèrica. Xile va declarar la " -"seva independència d'Espanya el 1810. A costa de Bolívia, Perú i el poble " +"Xile està situat a la costa sud-occidental de Sud-amèrica. Xile va declarar " +"la seva independència d'Espanya el 1810. A costa de Bolívia, Perú i el poble " "indígena maputxe, Xile va multiplicar el seu territori per més de dos durant " "el segle XIX. Xile, que sovint ha estat més estable i pròsper que els seus " "veïns, és actualment el país més desenvolupat de l'Amèrica Llatina." @@ -4034,7 +4034,7 @@ "Colombia's north coast around 1500. In 1819 the Republic of Colombia gained " "independence." msgstr "" -"Colòmbia és un país del nord de Sudamèrica. La regió era un centre cultural " +"Colòmbia és un país del nord de Sud-amèrica. La regió era un centre cultural " "amerindi durant l'època pre-europea. Els espanyols van començar a colonitzar " "la costa nord de Colòmbia al voltant del 1500. El 1819, la República de " "Colòmbia va obtenir la independència." @@ -4458,7 +4458,7 @@ "El Ducat de Curlàndia i Semigàlia fou creat com a resultat de la " "secularització de l'Estat de l'Orde Teutònica. Els ducs de Curlàndia van ser " "vassalls de Polònia fins al seu col·lapse. El Duc Jakob Kettler va liderar " -"els intents fracassats de colonització a Sudamèrica i Àfrica." +"els intents fracassats de colonització a Sud-amèrica i Àfrica." #: data/nation/cuyavian.ruleset:3 msgid "Cuyavian" @@ -4821,7 +4821,7 @@ "wars with both Colombia and Peru. Nowadays Ecuador is one of the main oil " "producing countries of South America." msgstr "" -"L'Equador és un país de l'oest de Sudamèrica. Està dividit en tres regions " +"L'Equador és un país de l'oest de Sud-amèrica. Està dividit en tres regions " "geogràfiques molt diferenciades: les terres baixes de la costa, les " "muntanyes dels Andes, i les jungles de l'\"Oriente\". Les illes Galàpagos " "també són part de l'Equador. El país va obtenir la seva independència " @@ -4829,7 +4829,7 @@ "marcada per la rivalitat entre la costa (Guayaquil) i les muntanyes (Quito). " "També ha lluitat nombroses guerres frontereres tant amb Colòmbia com amb " "Perú. Avui en dia, l'Equador és un dels principals països productors de " -"petroli de Sudamèrica." +"petroli de Sud-amèrica." #: data/nation/egyptianarab.ruleset:3 msgid "Egyptian Arab" @@ -8626,7 +8626,7 @@ "Mèxic deu el seu nom al poble Mexica, un dels noms que es donaven als " "asteques. Va aconseguir la independència d'Espanya el 1821. Durant la major " "part del segle XIX, el país va quedar devastat per rebel·lions i invasions " -"estrangeres, perdent meś de la meitat del seu territori a favor dels Estats " +"estrangeres, perdent més de la meitat del seu territori a favor dels Estats " "Units. Es va proclamar una constitució liberal el 1857, que va desembocar en " "una guerra civil de deu anys entre liberals i conservadors, durant la qual " "aquests últims van coronar Maximilià d'Àustria com a emperador sota " @@ -8635,7 +8635,7 @@ "moderna sota Porfirio Díaz (1876-1911) però les desigualtats socials i la " "repressió política van portar la Revolució Mexicana de 1910, que va deixar " "més d'un milió de morts. La Revolució va desembocar en l'establiment d'un " -"estat corporatiu de partit únic el 1929. Fins l'any 2000, Mèxico no va veure " +"estat corporatiu de partit únic el 1929. Fins l'any 2000, Mèxic no va veure " "una transferència democràtica de poder." #: data/nation/miao.ruleset:3 @@ -9118,10 +9118,10 @@ "in 1990, under the name of Namibia." msgstr "" "Encara que les potències europees van deixar de banda durant molt de temps " -"el desèrtic sudoest africà, l'Imperi alemany va establir-hi una colònia a " +"el desèrtic sud-oest africà, l'Imperi alemany va establir-hi una colònia a " "finals del segle XIX. Després de perdre la Primera Guerra Mundial, el " "territori va convertir-se en un mandat sota la responsabilitat de la Unió " -"Sudafricana. Finalment va obtenir la independència el 1990, amb el nom de " +"Sud-africana. Finalment va obtenir la independència el 1990, amb el nom de " "Namíbia." #: data/nation/nauruan.ruleset:3 @@ -10170,10 +10170,10 @@ "Paraguay started to see a democratic system of government and an impressive " "economic growth." msgstr "" -"El Paraguai es troba al cor de Sudamèrica. Fou conquerit pels espanyols a " +"El Paraguai es troba al cor de Sud-amèrica. Fou conquerit pels espanyols a " "finals del segle XVI. La colònia va ser controlada principalment pels " "jesuïtes fins la seva expulsió el 1767. El 1811, Paraguay va ser el primer " -"país sudamericà que va aconseguir la independència d'Espanya. Uns quants " +"país sud-americà que va aconseguir la independència d'Espanya. Uns quants " "dirigents molt autoritaris van governar el país amb tirania però també la " "van convertir en una potència militar i econòmica. La Guerra de la Triple " "Aliança de 1864-1870 va comportar la quasi anihilació del Paraguai, que va " @@ -10266,7 +10266,7 @@ "major center of indigenous South American culture." msgstr "" "El Perú va ser el bressol de l'Imperi i la civilització inques. Encara és " -"avui en dia un centre principal de cultura indígena sudamericana." +"avui en dia un centre principal de cultura indígena sud-americana." #: data/nation/phoenician.ruleset:3 msgid "Phoenician" @@ -10492,7 +10492,7 @@ "de convertir-se en un estat vassall del rei d'Espanya abans de patir el " "mateix destí que els seus antics enemics, els asteques. No obstant, la " "transició a la dominació espanyola no va ser fàcil i va degenerar en " -"violència. L'imperi, fundat al voltant del 1450, va esfondrar-se el 1521." +"violència. L'imperi, fundat al voltant del 1450, va esfondrar-se el 1530." #: data/nation/qatari.ruleset:3 msgid "Qatari" @@ -11912,21 +11912,21 @@ msgstr "" "Colons holandesos van començar a colonitzar el Sud d'Àfrica al segle XVII. " "Després de moltes guerres principalment entre Bòers (descendents dels colons " -"holandesos), les forces britàniques i els Zulus, la Unió Sudafricana va ser " -"creada el 1910. El govern sudafricà va guanyar notorietat per la seva " +"holandesos), les forces britàniques i els Zulus, la Unió Sud-africana va ser " +"creada el 1910. El govern sud-africà va guanyar notorietat per la seva " "política d'\"apartheid\": la desigualtat davant la llei segons el color de " "la pell dels ciutadans. Després de l'adopció de la primera constitució no " "racista del país el 1994, Nelson Mandela, que havia estat durant molt temps " -"un pres polític, va ser proclamat primer president de Sudàfrica triat d'una " +"un pres polític, va ser proclamat primer president de Sud-àfrica triat d'una " "forma realment democràtica." #: data/nation/southamerican.ruleset:3 msgid "South American" -msgstr "Sudamericà" +msgstr "Sud-americà" #: data/nation/southamerican.ruleset:4 msgid "?plural:South Americans" -msgstr "Sudamericans" +msgstr "Sud-americans" #: data/nation/southamerican.ruleset:6 msgid "" @@ -11934,7 +11934,7 @@ "European Union, but panamericanism has already existed since the 19th " "century." msgstr "" -"La Unió de Nacions Sudamericanes es va formar el 2008, seguint el model de " +"La Unió de Nacions Sud-americanes es va formar el 2008, seguint el model de " "la Unió Europea, però el panamericanisme existeix des del segle XIX." #: data/nation/southkorean.ruleset:3 @@ -12135,7 +12135,7 @@ "Suriname was granted self government in 1954 and became fully independent in " "1975." msgstr "" -"Surinam és el país independent més petit de Sudamèrica. Originalment estava " +"Surinam és el país independent més petit de Sud-amèrica. Originalment estava " "habitat per indis Arawak. Va ser colonitzat primer pels anglesos, que el van " "bescanviar amb els holandesos a canvi de Nova Amsterdam, la Nova York " "moderna, el 1667. Surinam va obtenir l'autogovern el 1954 i va obtenir la " @@ -13082,7 +13082,7 @@ "\"Switzerland of the Americas\" due to its once highly developed social " "welfare system." msgstr "" -"Uruguai és un petit país sudamericà, a vegades anomenat \"La Suïssa de les " +"Uruguai és un petit país sud-americà, a vegades anomenat \"La Suïssa de les " "Amèriques\" degut al seu sistema de benestar social que havia estat molt " "desenvolupat." @@ -13336,7 +13336,7 @@ "Latin America. The country is known for its varied landscapes and high " "biodiversity." msgstr "" -"Veneçuela és el país més septentrional de Sudamèrica. Va ser una colònia " +"Veneçuela és el país més septentrional de Sud-amèrica. Va ser una colònia " "espanyola des del segle XVI fins que el 5 de Juliol de 1811 va obtenir la " "independència sota el lideratge de Simón Bolívar \"El Libertador" "\" (l'Alliberador). Veneçuela té una de les reserves de petroli i gas " @@ -13932,7 +13932,7 @@ "les civilitzacions mesoamericanes més antigues i duradores. El centre " "zapoteca més notable, Monte Albán, va ser construït al damunt d'un cim " "anivellat artificialment. Benito Juárez, el primer president indígena de " -"Mèxica, era zapoteca." +"Mèxic, era zapoteca." #: data/nation/zhuang.ruleset:3 msgid "Zhuang" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/cs.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/cs.gmo differ diff -Nru freeciv-2.5.7/translations/nations/cs.po freeciv-2.5.8/translations/nations/cs.po --- freeciv-2.5.7/translations/nations/cs.po 2017-05-13 12:08:08.000000000 +0000 +++ freeciv-2.5.8/translations/nations/cs.po 2017-08-12 11:54:54.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: freeciv 2.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-01-21 15:42+0100\n" "Last-Translator: Dusan Hokuv \n" "Language-Team: Czech \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/da.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/da.gmo differ diff -Nru freeciv-2.5.7/translations/nations/da.po freeciv-2.5.8/translations/nations/da.po --- freeciv-2.5.7/translations/nations/da.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/da.po 2017-08-12 11:54:54.000000000 +0000 @@ -45,7 +45,7 @@ msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-01-30 14:56+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/de.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/de.gmo differ diff -Nru freeciv-2.5.7/translations/nations/de.po freeciv-2.5.8/translations/nations/de.po --- freeciv-2.5.7/translations/nations/de.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/de.po 2017-08-12 11:54:54.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: 1.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2015-06-30 23:26+0200\n" "Last-Translator: Marvin Gülker \n" "Language-Team: German Freeciv Translators \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/el.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/el.gmo differ diff -Nru freeciv-2.5.7/translations/nations/el.po freeciv-2.5.8/translations/nations/el.po --- freeciv-2.5.7/translations/nations/el.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/el.po 2017-08-12 11:54:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: freeciv 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:51+0300\n" "Last-Translator: Prekates Alexandros \n" "Language-Team: Greek translation team \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/en_GB.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/en_GB.gmo differ diff -Nru freeciv-2.5.7/translations/nations/en_GB.po freeciv-2.5.8/translations/nations/en_GB.po --- freeciv-2.5.7/translations/nations/en_GB.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/en_GB.po 2017-08-12 11:54:55.000000000 +0000 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-07-07 01:48+0100\n" "Last-Translator: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk>\n" "Language-Team: \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/eo.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/eo.gmo differ diff -Nru freeciv-2.5.7/translations/nations/eo.po freeciv-2.5.8/translations/nations/eo.po --- freeciv-2.5.7/translations/nations/eo.po 2017-05-13 12:08:09.000000000 +0000 +++ freeciv-2.5.8/translations/nations/eo.po 2017-08-12 11:54:55.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-07-10 17:52+0200\n" "Last-Translator: Antonio Codazzi \n" "Language-Team: Esperanto \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/es.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/es.gmo differ diff -Nru freeciv-2.5.7/translations/nations/es.po freeciv-2.5.8/translations/nations/es.po --- freeciv-2.5.7/translations/nations/es.po 2017-05-13 12:08:10.000000000 +0000 +++ freeciv-2.5.8/translations/nations/es.po 2017-08-12 11:54:55.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-07-19 12:09+0200\n" "Last-Translator: Jordi Negrevernis i Font \n" "Language-Team: Spanish <>\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/et.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/et.gmo differ diff -Nru freeciv-2.5.7/translations/nations/et.po freeciv-2.5.8/translations/nations/et.po --- freeciv-2.5.7/translations/nations/et.po 2017-05-13 12:08:10.000000000 +0000 +++ freeciv-2.5.8/translations/nations/et.po 2017-08-12 11:54:55.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: et\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:51+0300\n" "Last-Translator: Elmo Todurov \n" "Language-Team: eesti\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/fa.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/fa.gmo differ diff -Nru freeciv-2.5.7/translations/nations/fa.po freeciv-2.5.8/translations/nations/fa.po --- freeciv-2.5.7/translations/nations/fa.po 2017-05-13 12:08:10.000000000 +0000 +++ freeciv-2.5.8/translations/nations/fa.po 2017-08-12 11:54:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Arman Ordookhani \n" "Language-Team: Farsi(Persian)\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/fi.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/fi.gmo differ diff -Nru freeciv-2.5.7/translations/nations/fi.po freeciv-2.5.8/translations/nations/fi.po --- freeciv-2.5.7/translations/nations/fi.po 2017-05-13 12:08:10.000000000 +0000 +++ freeciv-2.5.8/translations/nations/fi.po 2017-08-12 11:54:56.000000000 +0000 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: freeciv 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" -"PO-Revision-Date: 2016-07-19 10:42+0300\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-11 23:20+0300\n" "Last-Translator: Markus Linnakangas \n" "Language-Team: None \n" "Language: fi\n" @@ -547,7 +547,6 @@ msgstr "afrikkalaisten" #: data/nation/african.ruleset:4 -#, fuzzy msgid "?plural:Africans" msgstr "afrikkalaiset" @@ -2390,6 +2389,10 @@ "in 1972 and renamed the country Benin three years later. Multiparty rule " "returned in 1990." msgstr "" +"Tämä maa oli aikoinaan Dahomeyn kuningaskunnan aluetta, ja Ranskan siirtomaa " +"1800-luvulla. Dahomey itsenäistyi 1960. Marxilaiset nousivat valtaan 1972 ja " +"nimesivät maan uudelleen Beniniksi kolme vuotta myöhemmin. Valta palasi " +"monipuoluejärjestelmälle 1990." #: data/nation/benin.ruleset:3 msgid "Benin" @@ -3075,6 +3078,17 @@ "Kingdom. The Burgundians gave their name to the later Romance nation and " "region of Burgundy." msgstr "" +"Burgundit olivat ikivanha itägermaaninen kansa joka todennäköisesti on " +"lähtöisin Bornholmin saarelta. Bornholmilta lähdettyään burgundit elivät " +"Oder- ja Vistula-jokien välimaastossa. Kansainvaellusaikaan burgundit " +"liittyivät muiden germaanisten kansojen joukkoon valloittamaan Rooman " +"keisarikuntaa, ja 472 jaa. jotkut heistä ryöstivät Rooman. Ensimmäinen " +"burgundien kuningaskunta perustettiin Wormsiin, mutta hunnien tuhon jäljiltä " +"burgundit siirtyivät alueelle joka nykyään tunnetaan nimellä nykyisen " +"Ranskan alueelle nimeltä Savoiji ja Burgundi, jonne toinen kuningaskunta " +"perustettiin. Lopulta kuningaskunta alistettiin osaksi Frankkien " +"valtakuntaa. Burgundit antoivat sittemmin nimensä myös myöhemmälle Burgundin " +"(ransk. Bourgogne) romaaniselle kansakunnalle ja alueelle." #. TRANS: The last letter in "Burkinabe" should be #. TRANS: U+00E9 LATIN SMALL LETTER E WITH ACUTE if available in @@ -3375,6 +3389,15 @@ "incorporated directly into the realm of the Franks. Slovenians are the " "modern descendants of the Carantanians." msgstr "" +"Karantanialaiset tai Alppien slaavit olivat varhaiskeskiaikainen, nykyisen " +"Itävallan alueetta asuttaneiden lounaisten slaaviheimojen liittouma. " +"Karantanian herttuakunta oli yksi varhaisimmista slaavivaltioista; se " +"perustettiin 600-luvulla jaa. 700-luvulla sillä oli riippuvuussuhde " +"Frankkien kuningaskuntaan, mikä johti siihen että herttua Gorazd kastettiin " +"kristinuskoon latinalaisessa riitissä. 819 vuodessa Karantania liittyi " +"kapinaan jota johti Kroatian herttua Ljudevit Posavski. Kaatumisensa jälkeen " +"822 valtio lakkautettiin ja liitettiin suoraan osaksi Frankkien valtakuntaa. " +"Nykyiset slovenialaiset ovat polveutuneet karantanialaisista." #: data/nation/castilian.ruleset:3 msgid "Castilian" @@ -3682,6 +3705,14 @@ "cities, Mayan peoples and natural wealth have made it one of Mexico's major " "tourist destinations." msgstr "" +"Chiapas on eteläisen Meksikon osavaltio. Sitä hallittiin Guatemalasta käsin " +"siirtomaavallan aikaan, mutta 1824, lyhyen itsenäisyyden ajan jälkeen, se " +"päätti liittyä osaksi Meksikoa. Chiapasissa asuu huomattavan kokoinen " +"alkuperäisväestö (enimmäkseen mayoja). Suurta osa Chiapasin historiaa " +"värittävät kahnaukset alkuperäiskansaan kuuluvien maanviljelijöiden ja " +"enimmäkseen ladinoista koostuvan eliitin välillä. Chiapasin siirtomaavallan " +"aikaiset kaupungit, mayat ja luonnonrikkaudet ovat tehneet siitä yhden " +"Meksikon keskeisistä turistikohteista." #: data/nation/chickasaw.ruleset:3 msgid "Chickasaw" @@ -3783,6 +3814,13 @@ "Whites throughout Oregon, Washington, British Columbia and all the way to " "Alaska." msgstr "" +"Chinookien liittovaltio oli ryhmä yhteisöjä joilla oli yhteiset tavat ja " +"kieli. Chinookit pysyttelivät aloillaan Columbia-joen varrella nykyisen " +"Yhdysvaltain Oregonin ja Washingtonin osavaltioiden alueella. Chinookien " +"alueellinen vaikutus näkyy siinä, että heidän kielestään muodostui Amerikan " +"alkuperäiskansojen ja valkoisten välisen kaupankäyntikielen pidginin pohja. " +"Pidgin oli käytössä Oregonin, Washingtonin, Brittiläisen Kolumbian ja jopa " +"Alaskan alueelle asti." #: data/nation/choctaw.ruleset:3 msgid "Choctaw" @@ -3804,6 +3842,16 @@ "managed to escape removal and stay behind. The word \"Oklahoma\" itself is " "derived from a Choctaw language term meaning \"red people\"." msgstr "" +"Choctawit olivat yksi nk. \"Viidestä sivistyneestä heimosta\", ja asuttivat " +"alunperin nykyisen USA:n Missisippin osavaltion keski- ja eteläosia. " +"Choctawit kohtasivat ensimmäisenä espanjalaiset tutkimusmatkailijat 1500-" +"luvulla, ja heistä tuli pitkäaikaisia Ranskan liittolaisia kunnes Amerikan " +"sisällissodan aikaan heimo liittyi Etelävaltioiden puolelle. Valtaosa " +"nykychoctaweista elää Oklahoman alueella, jonne heidät poistettiin " +"kotimaastaan väkisin presidentti Andrew Jacksonin valtakaudella 1831. Tämän " +"lisäksi Missisippin alueella elää choctaweja jotka onnistuivat pakenemaan " +"pakkosiirtoa ja jäämään Missisippin alueelle. Osavaltion nimi \"Oklahoma\" " +"on johdettu choctawin kielen termistä joka tarkoittaa \"punaista kansaa\"." #: data/nation/chola.ruleset:3 msgid "Chola" @@ -3834,11 +3882,11 @@ #: data/nation/chrobatian.ruleset:3 msgid "Chrobatian" -msgstr "" +msgstr "chrobatialaisten" #: data/nation/chrobatian.ruleset:4 msgid "?plural:Chrobatians" -msgstr "" +msgstr "chrobatialaiset" #: data/nation/chrobatian.ruleset:6 msgid "" @@ -3849,6 +3897,13 @@ "White Croatia is sometimes associated with a prince Slavnik, lord of Libice, " "whose influence extended to the region of Silesia and the land of Krakow." msgstr "" +"Chrobatia oli varhaiskeskiaikainen, osin tarunomainen slaavivaltio jonka " +"valkoiset kroaatit rakensivat osaan Keski-Eurooppaa. Valtion historia ja " +"sijainti ovat hämärän peitossa; pääasiallinen lähde valkokroaattisen valtion " +"olemassaololle on maininta bysanttilaiskeisari Konstantinos VII " +"purppurasyntyneen teoksessa. Valkoinen Kroatia liitetään joskus prinssi " +"Slavníkiin, Libicen hallitsijaan, jonka vaikutus ylsi Sleesian alueelle ja " +"Krakowin maille." #: data/nation/chrobatian.ruleset:29 data/nation/czechoslovak.ruleset:31 #: data/nation/czech.ruleset:33 data/nation/macedonian.ruleset:23 @@ -4081,6 +4136,18 @@ "Furthermore, the Union victory in the Civil War opened the way for the " "abolition of slavery in the United States." msgstr "" +"Amerikan valtioliitto eli Etelävaltiot oli Yhdysvalloista irtautunut pala " +"joka koostui yhdestätoista eteläisestä osavaltiosta ja jonka olemassaolo " +"kesti vuodesta 1861 vuoteen 1865. Osavaltiot irtautuivat Yhdysvalloista " +"poliittisista ja kulttuurisista erimielisyyksistä Pohjoisen kanssa, mihin " +"kuului näkyvimmin suhtautuminen orjuuteen, minkä lakkauttamista Etelävaltiot " +"pelkäsivät presidentti Abraham Lincolnin tultua juuri valituksi. " +"Etelävaltioiden pääkaupunki oli Richmond Virginiassa, ja maan ainoa " +"presidentti oli Jefferson Davis. Amerikan sisällissodassa Etelävaltiot " +"taisteli Yhdysvaltoja vastaan. Hävittyään taisteluissa useita kertoja " +"pohjoisvaltojen eli unionin joukoille Etelävaltioiden oli pakko luopua " +"itsenäisyysvaatimuksistaan: huomattava osa niiden alueesta oli raunioina. " +"Pohjoisvaltojen voitettua sisällissodan orjuus kiellettiin Yhdysvalloissa." #: data/nation/congolesebrazzaville.ruleset:3 msgid "Brazzaville-Congolese" @@ -6595,9 +6662,9 @@ msgstr "" #: data/nation/italiangreek.ruleset:48 -#, fuzzy, c-format +#, c-format msgid "Tyranne %s" -msgstr "Tyranni %s" +msgstr "Tyranne %s" #: data/nation/ivoirian.ruleset:3 msgid "Ivoirian" @@ -7526,6 +7593,9 @@ "Italy and Southern France. Their language is of uncertain origin, perhaps " "Para-Celtic or Pre-Indo-European." msgstr "" +"Liguurit olivat Roomaa edeltävä heimokompleksi nykyisen Luoteis-Italian ja " +"Etelä-Ranskan alueella. Liguurien kielen alkuperästä ei olla varmoja, mutta " +"sitä on arveltu parakelttiläiseksi tai esi-indoeurooppalaiseksi." # Paramount Chief on pikkupomo muiden pikkupomojen joukossa #: data/nation/ligurian.ruleset:22 data/nation/malaysian.ruleset:22 @@ -8091,6 +8161,11 @@ "free association with the United States in 1986. In the mid-20th the United " "States carried out numerous nuclear tests on the islands." msgstr "" +"Marshallinsaaret on maa Länsi-Tyynellämerellä, juuri päiväntasaajan " +"pohjoispuolella. Siihen kuuluu suuri joukko saaria ja atolleja. Saaria " +"asuttavat lähinnä mikronesialaiset, ja niistä tuli itsenäinen tasavalta joka " +"on osa Yhdysvaltoja liitännäisvaltiosopimuksella vuonna 1986. 1900-luvun " +"puolivälissä Yhdysvallat teki saarilla useita ydinkokeita." #: data/nation/martian.ruleset:3 msgid "Martian" @@ -8649,6 +8724,11 @@ "eventually subduing surrounding cities and principalities including the " "Novgorod Republic." msgstr "" +"Moskova nousi alueelliseksi vallaksi ja Kiovan Venäjän seuraajaksi 1100-" +"luvulla jaa. Rudrikid-hallitsijasuvun aikana moskovalaiset keskittivät " +"valtaa liittoutumalla Kultaisen ordan ja ortodoksikirkon kanssa, ja " +"myöhemmin valtasi ympäröiviä kaupunkeja ja ruhtinaskuntia kuten Novgorodin " +"tasavallan." #: data/nation/muskogee.ruleset:3 msgid "Muskogee" @@ -8660,7 +8740,7 @@ #: data/nation/muskogee.ruleset:5 msgid "American" -msgstr "yhdysvaltalaisten" +msgstr "amerikkalaisten" #: data/nation/muskogee.ruleset:6 msgid "" @@ -9097,6 +9177,9 @@ "from the Baltic Sea to the Ural Mountains. It existed between the 12th and " "15th centuries and was centered on the city of Novgorod." msgstr "" +"Novrogodin tasavalta oli suuri keskiaikainen venäläinen valtio joka ylsi " +"Itämereltä Uralvuorille. Se oli olemassa 1136-1478 ja rakentui Novrogodin " +"kaupungin ympärille." #: data/nation/nubian.ruleset:3 msgid "Nubian" @@ -9695,6 +9778,11 @@ "the satrap Arsakes they drove the Seleucids from Iran, where they created " "their own strong empire. Their culture was Hellenistic." msgstr "" +"Parthialaiset olivat alunperin keskiaasialainen paimentolaiskansa jotka " +"asuttivat Parthian aluetta Seleukidien kuningaskunnasta. Satraappi " +"Arsakeksen johdolla parthialaiset ajoivat seleukidit Iranista, ja loivat " +"sinne oman vahvan kuningaskunnan. Parthialaisten kulttuuri oli " +"helleeniläinen." #: data/nation/parthian.ruleset:35 #, c-format @@ -10230,11 +10318,11 @@ #: data/nation/sahrawi.ruleset:3 msgid "Sahrawi" -msgstr "sahrawien" +msgstr "länsisaharalaisten" #: data/nation/sahrawi.ruleset:4 msgid "?plural:Sahrawis" -msgstr "sahrawit" +msgstr "länsisaharalaiset" #: data/nation/sahrawi.ruleset:6 msgid "" @@ -10243,6 +10331,10 @@ "illegal occupation by most of the international community. The Moroccan Army " "and Sahrawi Polisario rebels have been fighting each other since 1975." msgstr "" +"Länsi-Sahara oli aikoinaan Espanjan siirtokunta. Marokko hallitsee tällä " +"hetkellä suurta osaa alueesta, ja valtaosa kansainvälisestä yhteisöstä pitää " +"tätä laittomana miehityksenä. Marokon armeija ja Saharan demokraattisen " +"arabitasavallan Polisario ovat taistelleet keskenään vuodesta 1975." #: data/nation/saintlucian.ruleset:3 msgid "Saint Lucian" @@ -10281,6 +10373,9 @@ "were very closely related to the European Scythians, and were probably " "descendants of the Andronovo culture." msgstr "" +"Sakat olivat antiikinaikainen iranilainen heimo Keski-Aasian aroilta. Sakat " +"olivat läheistä sukua Euroopan skyyteille, ja todennäköisesti polveutuivat " +"Andronovon kulttuurista." #: data/nation/salishan.ruleset:3 msgid "Salishan" @@ -10522,6 +10617,10 @@ "of the origin from the Sarmatians formed the basis of the Polish culture " "from the 15th to the 18th century." msgstr "" +"Sarmaatit olivat Iranilaisia paimenheimoja Keski-Aasiassa ja lounaisessa " +"Siperiassa. Sarmaatit olivat läheistä sukua sakoille ja skyyteille. " +"Sarmaattien alkuperän myytti pohjusti puolalaista kulttuuria 1400-1700-" +"luvuilla." #: data/nation/saudi.ruleset:3 msgid "Saudi" @@ -10623,13 +10722,14 @@ "Republic of Germany." msgstr "" +# Note: This is actually the name of the region rather than the language. #: data/nation/scottishgaelic.ruleset:3 msgid "Scottish Gaelic" -msgstr "" +msgstr "Gàidhealtachdin" #: data/nation/scottishgaelic.ruleset:4 msgid "?plural:Scottish Gaels" -msgstr "" +msgstr "gàidhealtachdlaiset" #: data/nation/scottishgaelic.ruleset:6 msgid "" @@ -12396,13 +12496,14 @@ msgid "?female:Mahatma %s" msgstr "Mahatma %s" +# This is partially a guess based on the 'vendit'/Wends people description stating that Veneti was the origin of the term Wends. #: data/nation/veletian.ruleset:3 msgid "Veletian" -msgstr "" +msgstr "vendien" #: data/nation/veletian.ruleset:4 msgid "?plural:Veletians" -msgstr "" +msgstr "vendit" #: data/nation/veletian.ruleset:6 msgid "" @@ -13043,6 +13144,16 @@ "Lao, Thai, and Shan nations. After the Han, the Zhuang are the most populous " "ethnic group of the People's Republic of China." msgstr "" +"Zhuangit elävät Kiinan lounaisosissa ikivanhalla raja-alueella joka on " +"pitkään erottanut siniittien kansan Kaakkois-Aasian alkuperäiskansoista. " +"Zhuangit tunnetaan ainutlaatuisista kastelujärjestelmistään sekä " +"luonnonkauniista porrastetuista riisiviljelmistään. Useat kiinalaiset " +"hallitsijasuvut painostivat zhuangeja melko jatkuvasti antiikin aikaan. 900-" +"luvulle jaa. tultaessa aluetta hallitsi rautanyrkillä kiinalainen Song-" +"hallitsijasuku. Kansansankari Nong Zhigao johti kapinaa 1052, mutta se " +"murskattiin. Tämän jälkeen moni zhuangeista muutti etelään ja loi sinn " +"eperustan Lao, Thai ja Shan-kansakunnille. Hanien jälkeen zhuangit ovat " +"väkiluvultaan toiseksi suurin etninen ryhmä Kiinan kansantasavallassa." #: data/nation/zimbabwean.ruleset:3 msgid "Zimbabwean" diff -Nru freeciv-2.5.7/translations/nations/freeciv-nations.pot freeciv-2.5.8/translations/nations/freeciv-nations.pot --- freeciv-2.5.7/translations/nations/freeciv-nations.pot 2017-05-13 12:08:08.000000000 +0000 +++ freeciv-2.5.8/translations/nations/freeciv-nations.pot 2017-08-12 11:54:54.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/fr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/fr.gmo differ diff -Nru freeciv-2.5.7/translations/nations/fr.po freeciv-2.5.8/translations/nations/fr.po --- freeciv-2.5.7/translations/nations/fr.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/fr.po 2017-08-12 11:54:56.000000000 +0000 @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Freeciv 2.4\n" +"Project-Id-Version: Freeciv 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" -"PO-Revision-Date: 2016-06-15 07:22+0200\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-05-04 22:33+0200\n" "Last-Translator: Igx \n" "Language-Team: French \n" "Language: fr\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ga.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ga.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ga.po freeciv-2.5.8/translations/nations/ga.po --- freeciv-2.5.7/translations/nations/ga.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ga.po 2017-08-12 11:54:56.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: freeciv 2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-01-29 07:42-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/gd.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/gd.gmo differ diff -Nru freeciv-2.5.7/translations/nations/gd.po freeciv-2.5.8/translations/nations/gd.po --- freeciv-2.5.7/translations/nations/gd.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/gd.po 2017-08-12 11:54:56.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2014-08-08 08:40+0100\n" "Last-Translator: Michael Bauer \n" "Language-Team: Akerbeltz\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/he.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/he.gmo differ diff -Nru freeciv-2.5.7/translations/nations/he.po freeciv-2.5.8/translations/nations/he.po --- freeciv-2.5.7/translations/nations/he.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/he.po 2017-08-12 11:54:57.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-12 15:15+0300\n" "Last-Translator: Chen Levy \n" "Language-Team: Hebrew \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/hu.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/hu.gmo differ diff -Nru freeciv-2.5.7/translations/nations/hu.po freeciv-2.5.8/translations/nations/hu.po --- freeciv-2.5.7/translations/nations/hu.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/hu.po 2017-08-12 11:54:57.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Freeciv 1.14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2007-08-12 15:37+0300\n" "Last-Translator: Gbor Takcs \n" "Language-Team: Hungarian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/id.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/id.gmo differ diff -Nru freeciv-2.5.7/translations/nations/id.po freeciv-2.5.8/translations/nations/id.po --- freeciv-2.5.7/translations/nations/id.po 2017-05-13 12:08:11.000000000 +0000 +++ freeciv-2.5.8/translations/nations/id.po 2017-08-12 11:54:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-07-26 20:54+0100\n" "Last-Translator: Dadan Haryana \n" "Language-Team: Indonesian <>\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/it.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/it.gmo differ diff -Nru freeciv-2.5.7/translations/nations/it.po freeciv-2.5.8/translations/nations/it.po --- freeciv-2.5.7/translations/nations/it.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/it.po 2017-08-12 11:54:57.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-03-26 15:29+0100\n" "Last-Translator: Paolo Sammicheli \n" "Language-Team: Italian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ja.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ja.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ja.po freeciv-2.5.8/translations/nations/ja.po --- freeciv-2.5.7/translations/nations/ja.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ja.po 2017-08-12 11:54:57.000000000 +0000 @@ -156,7 +156,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.0.99-devel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-07-16 16:36+0900\n" "Last-Translator: \n" "Language-Team: SAWADA Katsuya \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ko.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ko.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ko.po freeciv-2.5.8/translations/nations/ko.po --- freeciv-2.5.7/translations/nations/ko.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ko.po 2017-08-12 11:54:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Sungdae\n" "Language-Team: Korean language team\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/lt.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/lt.gmo differ diff -Nru freeciv-2.5.7/translations/nations/lt.po freeciv-2.5.8/translations/nations/lt.po --- freeciv-2.5.7/translations/nations/lt.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/lt.po 2017-08-12 11:54:57.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2010-10-11 20:07+0100\n" "Last-Translator: Andrius Štikonas \n" "Language-Team: Lithuanian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/nb.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/nb.gmo differ diff -Nru freeciv-2.5.7/translations/nations/nb.po freeciv-2.5.8/translations/nations/nb.po --- freeciv-2.5.7/translations/nations/nb.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/nb.po 2017-08-12 11:54:58.000000000 +0000 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-12 07:21+0300\n" "Last-Translator: Per I. Mathisen \n" "Language-Team: Norwegian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/nl.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/nl.gmo differ diff -Nru freeciv-2.5.7/translations/nations/nl.po freeciv-2.5.8/translations/nations/nl.po --- freeciv-2.5.7/translations/nations/nl.po 2017-05-13 12:08:12.000000000 +0000 +++ freeciv-2.5.8/translations/nations/nl.po 2017-08-12 11:54:58.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:52+0300\n" "Last-Translator: Jos Maalderink \n" "Language-Team: Nederlands \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/pl.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/pl.gmo differ diff -Nru freeciv-2.5.7/translations/nations/pl.po freeciv-2.5.8/translations/nations/pl.po --- freeciv-2.5.7/translations/nations/pl.po 2017-05-13 12:08:13.000000000 +0000 +++ freeciv-2.5.8/translations/nations/pl.po 2017-08-12 11:54:58.000000000 +0000 @@ -34,7 +34,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2015-02-09 15:05+0100\n" "Last-Translator: Hubert Kowalewski \n" "Language-Team: polski \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/pt_BR.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/pt_BR.gmo differ diff -Nru freeciv-2.5.7/translations/nations/pt_BR.po freeciv-2.5.8/translations/nations/pt_BR.po --- freeciv-2.5.7/translations/nations/pt_BR.po 2017-05-13 12:08:13.000000000 +0000 +++ freeciv-2.5.8/translations/nations/pt_BR.po 2017-08-12 11:54:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.1.0-beta3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2011-02-02 11:49-0200\n" "Last-Translator: Djavan Fagundes \n" "Language-Team: Brazilian Portuguese \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/pt.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/pt.gmo differ diff -Nru freeciv-2.5.7/translations/nations/pt.po freeciv-2.5.8/translations/nations/pt.po --- freeciv-2.5.7/translations/nations/pt.po 2017-05-13 12:08:13.000000000 +0000 +++ freeciv-2.5.8/translations/nations/pt.po 2017-08-12 11:54:58.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Duarte Loreto \n" "Language-Team: \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ro.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ro.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ro.po freeciv-2.5.8/translations/nations/ro.po --- freeciv-2.5.7/translations/nations/ro.po 2017-05-13 12:08:13.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ro.po 2017-08-12 11:54:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: po-debconf://kdebase\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: stan ioan-eugen \n" "Language-Team: romanian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/ru.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/ru.gmo differ diff -Nru freeciv-2.5.7/translations/nations/ru.po freeciv-2.5.8/translations/nations/ru.po --- freeciv-2.5.7/translations/nations/ru.po 2017-05-13 12:08:13.000000000 +0000 +++ freeciv-2.5.8/translations/nations/ru.po 2017-08-12 11:54:59.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" -"PO-Revision-Date: 2017-05-10 09:18+0500\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" +"PO-Revision-Date: 2017-08-05 00:15+0500\n" "Last-Translator: Konstantin Vedeneev \n" "Language-Team: Russian \n" "Language: ru\n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/sr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/sr.gmo differ diff -Nru freeciv-2.5.7/translations/nations/sr.po freeciv-2.5.8/translations/nations/sr.po --- freeciv-2.5.7/translations/nations/sr.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/sr.po 2017-08-12 11:54:59.000000000 +0000 @@ -50,7 +50,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Goran Rakic \n" "Language-Team: Serbian (sr) \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/sv.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/sv.gmo differ diff -Nru freeciv-2.5.7/translations/nations/sv.po freeciv-2.5.8/translations/nations/sv.po --- freeciv-2.5.7/translations/nations/sv.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/sv.po 2017-08-12 11:54:59.000000000 +0000 @@ -56,7 +56,7 @@ msgstr "" "Project-Id-Version: Freeciv 2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2010-06-20 19:43+0200\n" "Last-Translator: Jon Severinsson \n" "Language-Team: Swedish \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/tr.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/tr.gmo differ diff -Nru freeciv-2.5.7/translations/nations/tr.po freeciv-2.5.8/translations/nations/tr.po --- freeciv-2.5.7/translations/nations/tr.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/tr.po 2017-08-12 11:54:59.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2008-06-01 16:36+0300\n" "Last-Translator: Uğur Çetin \n" "Language-Team: Turkish \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/uk.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/uk.gmo differ diff -Nru freeciv-2.5.7/translations/nations/uk.po freeciv-2.5.8/translations/nations/uk.po --- freeciv-2.5.7/translations/nations/uk.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/uk.po 2017-08-12 11:54:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: freeciv 2.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2016-11-19 1:27+0300\n" "Last-Translator: Swiatoslav Golda \n" "Language-Team: Ukrainian \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/zh_CN.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/zh_CN.gmo differ diff -Nru freeciv-2.5.7/translations/nations/zh_CN.po freeciv-2.5.8/translations/nations/zh_CN.po --- freeciv-2.5.7/translations/nations/zh_CN.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/zh_CN.po 2017-08-12 11:55:00.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: freeciv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2013-09-09 10:53+0300\n" "Last-Translator: Hongjia Cao \n" "Language-Team: zh_CN \n" Binary files /tmp/tmp1uJUrd/fwZLFVeZTw/freeciv-2.5.7/translations/nations/zh_TW.gmo and /tmp/tmp1uJUrd/naJGsWeXql/freeciv-2.5.8/translations/nations/zh_TW.gmo differ diff -Nru freeciv-2.5.7/translations/nations/zh_TW.po freeciv-2.5.8/translations/nations/zh_TW.po --- freeciv-2.5.7/translations/nations/zh_TW.po 2017-05-13 12:08:14.000000000 +0000 +++ freeciv-2.5.8/translations/nations/zh_TW.po 2017-08-12 11:55:00.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: freeciv 2.4.99-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-13 13:08+0100\n" +"POT-Creation-Date: 2017-08-12 12:54+0100\n" "PO-Revision-Date: 2012-08-24 23:47+0800\n" "Last-Translator: Zhang Xiaowei \n" "Language-Team: Chinese (Traditional) \n" diff -Nru freeciv-2.5.7/utility/fc_utf8.c freeciv-2.5.8/utility/fc_utf8.c --- freeciv-2.5.7/utility/fc_utf8.c 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/utility/fc_utf8.c 2017-08-12 11:47:33.000000000 +0000 @@ -175,7 +175,7 @@ /* Jump to next character in src. */ src = fc_utf8_find_next_char(end); - if ('\0' == *src) { + if (src == NULL || *src == '\0') { *dest = '\0'; return src_len; /* End of 'src' reached. */ } diff -Nru freeciv-2.5.7/utility/ioz.c freeciv-2.5.8/utility/ioz.c --- freeciv-2.5.7/utility/ioz.c 2017-05-13 11:54:01.000000000 +0000 +++ freeciv-2.5.8/utility/ioz.c 2017-08-12 11:47:33.000000000 +0000 @@ -79,7 +79,7 @@ #ifdef HAVE_LIBLZMA -#define PLAIN_FILE_BUF_SIZE (1024*1024) /* 1024kb */ +#define PLAIN_FILE_BUF_SIZE (8096*1024) /* 8096kb */ #define XZ_DECODER_TEST_SIZE (4*1024) /* 4kb */ /* In my tests 7Mb proved to be not enough and with 10Mb decompression diff -Nru freeciv-2.5.7/win32/installer/Makefile freeciv-2.5.8/win32/installer/Makefile --- freeciv-2.5.7/win32/installer/Makefile 2017-05-13 11:54:00.000000000 +0000 +++ freeciv-2.5.8/win32/installer/Makefile 2017-08-12 11:47:33.000000000 +0000 @@ -5,7 +5,7 @@ # # 1. download and extract the MinGW build environment from # https://sourceforge.net/projects/freeciv/files/dependencies/gnuwin32/ -# Current version is gnuwin32-2016-07-27. +# Current version is gnuwin32-2017-07-30. # 2. double click on "gnuwin32/msys.bat" # 3. install the development packages: # $ hg qpush -a @@ -42,7 +42,7 @@ snapshot: cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="svn" EXTRA_CONFIG="--enable-svnrev" all + make VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev" all # build Freeciv @@ -143,6 +143,7 @@ libvorbis-0.dll \ libvorbisfile-3.dll \ libxml2-2.dll \ + mgwhelp.dll \ pthreadGC2.dll \ ssleay32.dll \ zlib1.dll