Bug#768176: unblock: pioneers/14.1-3

To: Niels Thykier <niels@thykier.net>, 768176@bugs.debian.org, Bas Wijnen <wijnen@debian.org>
Subject: Bug#768176: unblock: pioneers/14.1-3
From: Roland Clobus <rclobus@rclobus.nl>
Date: Sun, 21 Dec 2014 02:18:53 +0100
Message-id: <[🔎] 54961FFD.7050704@rclobus.nl>
Reply-to: Roland Clobus <rclobus@rclobus.nl>, 768176@bugs.debian.org
In-reply-to: <[🔎] 548BFB2D.5030207@thykier.net>
References: <20141105172001.GQ1150@a82-93-13-222.adsl.xs4all.nl> <20141105223727.GE15155@lupin.home.powdarrmonkey.net> <20141106094551.GW1150@a82-93-13-222.adsl.xs4all.nl> <470fbdeb31294d328d28653a42dbf4ed@hogwarts.powdarrmonkey.net> <546F7AF9.2050508@thykier.net> <20141125150923.GI2846@a82-93-13-222.adsl.xs4all.nl> <5474DCF9.8020506@thykier.net> <[🔎] 5489F515.1090603@thykier.net> <[🔎] 548A9525.4050100@rclobus.nl> <[🔎] 548BFB2D.5030207@thykier.net>

Hello Niels and Bas,

On 13/12/14 09:39, Niels Thykier wrote:
> On 2014-12-12 08:11, Roland Clobus wrote:
>> On 11/12/14 20:48, Niels Thykier wrote:> Any news on the targeted fix
>> for t-p-u?
>>>
>>> As mentioned you can include the translations *if* the you can provide
>>> us with a debdiff in December (or very early January).
>>
>> I'm currently working on the translation patches.
...
>> I expect to be able to finish the patch and let Bas sponsor the upload
>> before Christmas.

> Thanks, please let us know once when it is ready or if it turns out that
> it will not be ready before Christmas.

I've uploaded 14.1-3 to mentors.debian.net, it should appear there soon. [1]

I've implemented the license clarification by changing the
debian/copyright format.

The translation updates are in the patches directory. Due to spelling
corrections in the source code, the differences are rather large
(although I tried to make is as small as I thought sensible).
Attached you'll find the result of debdiff (for 14.1-2 to 14.1-3)

With kind regards,
Roland Clobus

[1] http://mentors.debian.net/package/pioneers

diff -Nru pioneers-14.1/debian/changelog pioneers-14.1/debian/changelog
--- pioneers-14.1/debian/changelog	2013-01-25 16:32:49.000000000 +0100
+++ pioneers-14.1/debian/changelog	2014-12-21 01:55:45.000000000 +0100
@@ -1,3 +1,12 @@
+pioneers (14.1-3) unstable; urgency=medium
+
+  * Updated copyright which clarifies the license for the images.
+    (closes: #765319)
+  * Applied license patch from the upstream repository.
+  * Updated translations, as mentioned in #768176.
+
+ -- Roland Clobus <rclobus@rclobus.nl>  Sun, 28 Dec 2014 02:00:00 +0100
+
 pioneers (14.1-2) unstable; urgency=low
 
   * Debian-only i18n-release during freeze.
diff -Nru pioneers-14.1/debian/control pioneers-14.1/debian/control
--- pioneers-14.1/debian/control	2012-05-18 15:43:47.000000000 +0200
+++ pioneers-14.1/debian/control	2014-11-29 15:03:18.000000000 +0100
@@ -20,7 +20,7 @@
  It can be played over the internet.
  .
  The game includes a server, a client, a computer player, an editor and
- (in a separate package) a meta-server (for locating running servers).
+ (in a separate package) a metaserver (for locating running servers).
 
 Package: pioneers-console
 Architecture: any
@@ -41,8 +41,8 @@
  Pioneers is a computer implementation of the Settlers of Catan board game.
  It can be played over the internet.
  .
- This package contains a meta-server, which can be used to locate running
- servers. Most people will use a central meta-server, and do not need this
+ This package contains a metaserver, which can be used to locate running
+ servers. Most people will use a central metaserver, and do not need this
  package.
 
 Package: pioneers-data
diff -Nru pioneers-14.1/debian/copyright pioneers-14.1/debian/copyright
--- pioneers-14.1/debian/copyright	2012-11-01 12:41:15.000000000 +0100
+++ pioneers-14.1/debian/copyright	2014-11-29 15:03:18.000000000 +0100
@@ -1,53 +1,112 @@
-This package was first debianized by Dave Cole dave@dccs.com.au on
-Sat,  8 May 1999 20:35:36 +1000.
-
-It was downloaded from 
-  http://sourceforge.net/projects/pio/files/
-
-Although the debian packaging is not in the release tarball, it is part of the
-upstream source, and is covered by the same license.  Copyright holders of the
-packaging are:
-Dave Cole
-Andy Heroff
-Jeff Breidenbach
-Bas Wijnen
-Roland Clobus
-
-This software is copyright (c) 2000-2012 by:
-Dave Cole <dave@dccs.com.au>
-Andy Heroff <aheroff@mediaone.net>
-Roman Hodek <roman@hodek.net>
-Dan Egnor <egnor@ofb.net>
-Steve Langasek <vorlon@dodds.net>
-Bibek Sahu <scorpio@dodds.net>
-Roderick Schertler <roderick@argon.org>
-Jeff Breidenbach <jab@debian.org>
-David Fallon <davef@tetsubo.com>
-Matt Waggoner <matt@waggoner.com>
-Geoff Hanson <gwhizz@usa.net>
-Bas Wijnen <shevek@fmf.nl>
-Roland Clobus <rclobus@bigfoot.com>
-Brian Wellington <bwelling@xbill.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in the following files:
-Version 2: /usr/share/common-licenses/GPL-2
-Version 3: /usr/share/common-licenses/GPL-3
-
-Note that you can choose any version later than 3 as well once they are
-released.  The above links are only provided for your convenience, not to
-suggest an complete list.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Pioneers
+Upstream-Contact: Roland Clobus <rclobus@rclobus.nl>
+Source: https://sourceforge.net/projects/pio/files/
+
+Files: *
+Copyright: 2000-2014 by the following authors
+ Dave Cole <dave@dccs.com.au>
+ Andy Heroff <aheroff@mediaone.net>
+ Roman Hodek <roman@hodek.net>
+ Dan Egnor <egnor@ofb.net>
+ Steve Langasek <vorlon@dodds.net>
+ Bibek Sahu <scorpio@dodds.net>
+ Roderick Schertler <roderick@argon.org>
+ Jeff Breidenbach <jab@debian.org>
+ David Fallon <davef@tetsubo.com>
+ Matt Waggoner <matt@waggoner.com>
+ Geoff Hanson <gwhizz@usa.net>
+ Bas Wijnen <shevek@fmf.nl>
+ Roland Clobus <rclobus@rclobus.nl>
+ Brian Wellington <bwelling@xbill.org>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Comment:
+ This package was first debianized by Dave Cole dave@dccs.com.au on
+ 1999-05-08T20:35:36+1000.
+ .
+ Although the debian packaging is not in the release tarball, it is part of the
+ upstream source, and is covered by the same license.
+Copyright: The copyright holders of the packaging are:
+ Dave Cole <dave@dccs.com.au>
+ Andy Heroff <aheroff@mediaone.net>
+ Jeff Breidenbach <jab@debian.org>
+ Bas Wijnen <shevek@fmf.nl>
+ Roland Clobus <rclobus@rclobus.nl>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files:
+ client/gtk/data/style-ai.png
+ editor/gtk/pioneers-editor.svg
+ server/gtk/pioneers-server.svg
+Copyright: Roland Clobus <rclobus@rclobus.nl>
+Comment:
+ It contains artwork (computer and pencil) from the Gorilla theme
+ from the "GNOME Project", http://www.gnome.org, which has been
+ relicensed to CC-BY-SA-4.0.
+License: CC-BY-SA-4.0
+ This work is licenced under the terms of Creative Commons Attribution-Share
+ Alike 4.0 License.
+ .
+ To view a copy of the CC-BY-SA licence, visit
+ http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative
+ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+Files: client/gtk/data/pioneers.svg
+Copyright: Roland Clobus <rclobus@rclobus.nl>
+License: CC-BY-SA-4.0
+ This desktop icon is licensed under the terms of Creative Commons
+ Attribution-Share Alike 4.0 License.
+ .
+ To view a copy of the CC-BY-SA licence, visit
+ http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative
+ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+Files: client/gtk/data/themes/ccFlickr/*
+Copyright: Aaron Williamson <aaron@copiesofcopies.org>
+License: CC-BY-SA
+ The images in this theme are licensed under the terms of Creative Commons
+ Attribution-Share Alike License.
+ .
+ See client/gtk/data/themes/ccFlickr/ATTRIB for the details.
diff -Nru pioneers-14.1/debian/patches/series pioneers-14.1/debian/patches/series
--- pioneers-14.1/debian/patches/series	2013-01-25 15:04:21.000000000 +0100
+++ pioneers-14.1/debian/patches/series	2014-12-20 21:31:48.000000000 +0100
@@ -3,3 +3,6 @@
 svn1830.diff
 svn1836.diff
 svn1841-1844.diff
+svn2085.diff
+svn1871_i18n_only.diff
+svn1860-2091_po.diff
diff -Nru pioneers-14.1/debian/patches/svn1860-2091_po.diff pioneers-14.1/debian/patches/svn1860-2091_po.diff
--- pioneers-14.1/debian/patches/svn1860-2091_po.diff	1970-01-01 01:00:00.000000000 +0100
+++ pioneers-14.1/debian/patches/svn1860-2091_po.diff	2014-12-21 00:54:36.000000000 +0100
@@ -0,0 +1,9685 @@
+Description: Translation file updates.
+ This patch was created without the '--show-c-function' in QUILT_DIFF_OPTS,
+ because that will lead to an invalid UTF-8 encoded patch file.
+.
+ The latest translations were copied, and then 'intltool-update -r' was
+ applied. Finally the patches were minimized by hand.
+ Occasionally a period at the end of a sentence was introduced, to match the
+ new string.
+Author: Roland Clobus <rclobus@rclobus.nl>
+Origin: upstream
+Applied-Upstream: 1860-2091
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -u --label pioneers-14.1.orig/po/LINGUAS --label pioneers-14.1/po/LINGUAS 	     .pc/svn1860-2091_po.diff/po/LINGUAS po/LINGUAS
+Index: pioneers-14.1/po/LINGUAS
+===================================================================
+--- pioneers-14.1.orig/po/LINGUAS
++++ pioneers-14.1/po/LINGUAS
+@@ -15,3 +15,4 @@
+ nl
+ pt
+ sv
++zh_CN
+diff -u --label pioneers-14.1.orig/po/af.po --label pioneers-14.1/po/af.po 	     .pc/svn1860-2091_po.diff/po/af.po po/af.po
+Index: pioneers-14.1/po/af.po
+===================================================================
+--- pioneers-14.1.orig/po/af.po
++++ pioneers-14.1/po/af.po
+@@ -1,24 +1,22 @@
+ # Pioneers - Settlers of Catan for GNOME.
+ # This file is distributed under the same license as the pioneers package.
+-#
+-# Petri Jooste <petri.jooste@gmail.com>, 2006.
++# Petri Jooste <petri.jooste@gmail.com>, 2006, 2013.
+ # Petri Jooste <Petri.Jooste@nwu.ac.za>, 2006.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 0.10.2\n"
++"Project-Id-Version: Pioneers 15.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2011-10-30 14:57+0100\n"
+-"Last-Translator: Arthur Rilke <Unknown>\n"
+-"Language-Team: Afrikaans <af@li.org>\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-11-19 16:16+0200\n"
++"Last-Translator: Petri Jooste <petri.jooste@gmail.com>\n"
++"Language-Team: Afrikaans\n"
+ "Language: af\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: Virtaal 0.7.1\n"
+ "X-Launchpad-Export-Date: 2010-09-26 08:28+0000\n"
+-"X-Generator: Launchpad (build Unknown)\n"
+-"X-Poedit-Language: Afrikaans\n"
+-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -32,9 +30,8 @@
+ 
+ #. Commandline pioneersai: name
+ #: ../client/ai/ai.c:76
+-#, fuzzy
+ msgid "Computer name (mandatory)"
+-msgstr "Naam vir robotspeler (leeg = enige naam)"
++msgstr "Naam vir robotspeler (verpligtend)"
+ 
+ #. Commandline pioneersai: time
+ #: ../client/ai/ai.c:79
+@@ -173,7 +170,7 @@
+ #. AI chat when it moves the robber
+ #: ../client/ai/greedy.c:1345
+ msgid "Hehe!"
+-msgstr "He he he!"
++msgstr "Ha ha ha!"
+ 
+ #. AI chat when it moves the robber
+ #: ../client/ai/greedy.c:1347
+@@ -198,7 +195,7 @@
+ #. AI chat when it must discard resources
+ #: ../client/ai/greedy.c:1361
+ msgid "Oh no!"
+-msgstr "Ag Nee!"
++msgstr "Ag nee!"
+ 
+ #. AI chat when it must discard resources
+ #: ../client/ai/greedy.c:1363
+@@ -243,7 +240,7 @@
+ #. AI chat when someone steals from it
+ #: ../client/ai/greedy.c:1385
+ msgid "Thieves! Thieves!!"
+-msgstr "Dief!  Dief!!"
++msgstr "Dief! Dief!!"
+ 
+ #. AI chat when someone steals from it
+ #: ../client/ai/greedy.c:1387
+@@ -253,7 +250,7 @@
+ #. AI chat when someone plays the monopoly card
+ #: ../client/ai/greedy.c:1392
+ msgid "Oh no :("
+-msgstr "Ag Nee :("
++msgstr "Ag nee :("
+ 
+ #. AI chat when someone plays the monopoly card
+ #: ../client/ai/greedy.c:1394
+@@ -263,7 +260,7 @@
+ #. AI chat when someone plays the monopoly card
+ #: ../client/ai/greedy.c:1396
+ msgid "Args"
+-msgstr "Args"
++msgstr "Eish"
+ 
+ #. AI chat when it has the largest army
+ #: ../client/ai/greedy.c:1401
+@@ -310,7 +307,7 @@
+ "Hello, welcome to the lobby. I am a simple robot. Type '/help' in the chat "
+ "to see the list of commands I know."
+ msgstr ""
+-"Hallo, welkom in die voorportaal.  Ek is 'n eenvoudige robot. Tik '/help' in "
++"Hallo, welkom in die voorportaal. Ek is 'n eenvoudige robot. Tik '/help' in "
+ "die geselsvenster om te sien watter opdragte ek ken."
+ 
+ #. Translators: don't translate '/help'
+@@ -337,12 +334,12 @@
+ "registers it at the metaserver. The other players can subsequently "
+ "disconnect from the lobby, and enter that game."
+ msgstr ""
+-"Hierdie bord word nie bedoel as 'n spel wat gespeel moet word nie.  Spelers "
+-"kan mekaar hier ontmoet en dan besluit watter bord hulle wil speel.  Dan "
+-"moet een van die spelers die voorgestelde spel opstel en aanbied deur 'n "
+-"bediener daarvoor aan die gang te sit en dit by 'n metabediener te "
+-"registreer.  Die ander spelers kan daarna die voorportaal verlaat en by die "
+-"nuwe spel aansluit."
++"Hierdie bord word nie bedoel as 'n spel wat gespeel moet word nie. Spelers "
++"kan mekaar hier ontmoet en dan besluit watter bord hulle wil speel. Dan moet "
++"een van die spelers die voorgestelde spel opstel en aanbied deur 'n bediener "
++"daarvoor aan die gang te sit en dit by 'n metabediener te registreer. Die "
++"ander spelers kan daarna die voorportaal verlaat en by die nuwe spel "
++"aansluit."
+ 
+ #: ../client/ai/lobbybot.c:130
+ msgid "The last released version of Pioneers is"
+@@ -351,7 +348,7 @@
+ #. The lobbybot leaves when a game is starting
+ #: ../client/ai/lobbybot.c:146
+ msgid "The game is starting. I'm not needed anymore. Goodbye."
+-msgstr "Die spel begin nou.  Ek word nie meer hier benodig nie. Totsiens."
++msgstr "Die spel begin nou. Ek word nie meer hier benodig nie. Totsiens."
+ 
+ #: ../client/common/client.c:106
+ msgid "Waiting"
+@@ -889,9 +886,9 @@
+ msgstr "%s, %s"
+ 
+ #: ../client/common/robber.c:62
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s has undone the robber movement.\n"
+-msgstr "%s moet die rower skuif.\n"
++msgstr "%s het die rowerskuif gekanselleer.\n"
+ 
+ #: ../client/common/robber.c:65
+ #, c-format
+@@ -899,9 +896,9 @@
+ msgstr "%s het die rower geskuif.\n"
+ 
+ #: ../client/common/robber.c:75
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s has undone the pirate movement.\n"
+-msgstr "%s het 'n skip se skuif gekanselleer.\n"
++msgstr "%s het die seerowerskuif gekanselleer.\n"
+ 
+ #: ../client/common/robber.c:78
+ #, c-format
+@@ -935,13 +932,13 @@
+ 
+ #: ../client/gtk/avahi-browser.c:83
+ msgid "Select an automatically discovered game"
+-msgstr ""
++msgstr "Kies 'n spel wat outomaties ontdek is"
+ 
+ #. $1=Game title, $2=version, $3=host_name, $4=port
+ #: ../client/gtk/avahi-browser.c:132
+ #, c-format
+ msgid "%s (%s) on %s:%s"
+-msgstr ""
++msgstr "%s (%s) op %s:%s"
+ 
+ #. Label text
+ #: ../client/gtk/chat.c:73
+@@ -973,7 +970,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Metabediener by %s, poort %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -982,17 +979,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Meta-bediener het ons afgeskop\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Die metabediener het die verbinding onverwags toegemaak.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Besig om name te kry vanaf metabediener.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Nuwe spelbediener aangevra op %s poort %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Nuwe spelbediener aangevra op %s poort %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -1000,8 +997,8 @@
+ msgstr "Onbekende boodskap vanaf die metabediener: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Te veel metabediener herleidings\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Te veel metabediener herleidings.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1010,7 +1007,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Metabediener te oud om nuwe bedieners te skep (weergawe %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1041,11 +1038,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Herlei na metabediener by %s, poort %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Herlei na die metabediener by %s, poort %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Ontvang tans 'n lys van Pioniersbedieners vanaf die meta-bediener.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1060,24 +1057,22 @@
+ 
+ #. Label
+ #: ../client/gtk/connect.c:726
+-#, fuzzy
+ msgid "Number of computer players"
+-msgstr "Tipe robotspeler"
++msgstr "Aantal robotspelers"
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:746
+-#, fuzzy
+ msgid "The number of computer players"
+-msgstr "Die hoeveelheid spelers"
++msgstr "Die aantal robotspelers"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Nuwe spelbediener word aangevra\n"
++msgid "Requesting new game server.\n"
++msgstr "Nuwe spelbediener word aangevra.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+-#, fuzzy, c-format
++#, c-format
+ msgid "Error starting %s: %s\n"
+-msgstr "Fout met begin van diens %s: %s"
++msgstr "Fout tydens begin van %s: %s\n"
+ 
+ #. Dialog caption
+ #: ../client/gtk/connect.c:832
+@@ -1101,7 +1096,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Skep 'n nuwe openbare spel by die metabediener"
+ 
+ #. Tooltip
+@@ -1197,7 +1192,6 @@
+ 
+ #. Tooltip for column 'Port'
+ #: ../client/gtk/connect.c:1127
+-#, fuzzy
+ msgid "Port of the game"
+ msgstr "Poort van die spel"
+ 
+@@ -1235,27 +1229,27 @@
+ 
+ #: ../client/gtk/connect.c:1280
+ msgid "Check if you want to be a spectator"
+-msgstr "Wil jy 'n toeskouer wees?"
++msgstr "Merk as jy 'n toeskouer wil wees"
+ 
+ #. Label
+ #: ../client/gtk/connect.c:1291
+ msgid "Avahi"
+-msgstr ""
++msgstr "Avahi"
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1298
+ msgid "Join"
+-msgstr ""
++msgstr "Sluit aan"
+ 
+ #. Tooltip for button Join
+ #: ../client/gtk/connect.c:1302
+ msgid "Join an automatically discovered game"
+-msgstr ""
++msgstr "Sluit aan by 'n spel wat outomaties ontdek is"
+ 
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta-bediener"
+ 
+ #. Button
+@@ -1298,7 +1292,7 @@
+ #. Tooltip
+ #: ../client/gtk/connect.c:1576
+ msgid "Name of the host of the game"
+-msgstr "Naam van die gasheer van die spel"
++msgstr "Naam van die gasheermasjien van die spel"
+ 
+ #. Label
+ #. Commandline option of client: port of the server
+@@ -1311,7 +1305,7 @@
+ #. Tooltip
+ #: ../client/gtk/connect.c:1597
+ msgid "Port of the host of the game"
+-msgstr "Poort van die gasheer van die spel"
++msgstr "Poort van die gasheermasjien van die spel"
+ 
+ #. Tooltip
+ #. Label
+@@ -1335,10 +1329,10 @@
+ msgstr "Gooi hulpbronne weg"
+ 
+ #: ../client/gtk/discard.c:101
+-#, fuzzy, c-format
++#, c-format
+ msgid "You must discard %d resource"
+ msgid_plural "You must discard %d resources"
+-msgstr[0] "Jy moet %d hulpbronne weggooi"
++msgstr[0] "Jy moet %d hulpbron weggooi"
+ msgstr[1] "Jy moet %d hulpbronne weggooi"
+ 
+ #. Label
+@@ -1372,10 +1366,10 @@
+ msgstr "Kies hulpbronne"
+ 
+ #: ../client/gtk/gold.c:96
+-#, fuzzy, c-format
++#, c-format
+ msgid "You may choose %d resource"
+ msgid_plural "You may choose %d resources"
+-msgstr[0] "Jy mag %d hulpbronne kies"
++msgstr[0] "Jy mag %d hulpbron kies"
+ msgstr[1] "Jy mag %d hulpbronne kies"
+ 
+ #. Text for total in choose gold dialog
+@@ -1437,7 +1431,7 @@
+ #. Menu entry
+ #: ../client/gtk/gui.c:254
+ msgid "L_egend"
+-msgstr "_Uiteensetting"
++msgstr "Uit_eensetting"
+ 
+ #. Tooltip for Legend menu entry
+ #: ../client/gtk/gui.c:256
+@@ -1489,7 +1483,7 @@
+ #. Tooltip for Roll Dice menu entry
+ #: ../client/gtk/gui.c:279
+ msgid "Roll the dice"
+-msgstr "Gooi kanssteentjies"
++msgstr "Gooi die kanssteentjies"
+ 
+ #. Menu entry
+ #. Tooltip for Trade menu entry
+@@ -1598,7 +1592,7 @@
+ #. Menu entry
+ #: ../client/gtk/gui.c:340
+ msgid "_Settings"
+-msgstr "Op_stellings"
++msgstr "_Stellings"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:343
+@@ -1613,27 +1607,27 @@
+ #. Menu entry
+ #: ../client/gtk/gui.c:349 ../editor/gtk/editor.c:1297
+ msgid "_View"
+-msgstr ""
++msgstr "_Bekyk"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:352 ../editor/gtk/editor.c:1341
+ msgid "_Reset"
+-msgstr ""
++msgstr "He_rstel"
+ 
+ #. Tooltip for Reset menu entry
+ #: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1344
+ msgid "View the full map"
+-msgstr ""
++msgstr "Bekyk die hele kaart"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:358 ../editor/gtk/editor.c:1347
+ msgid "_Center"
+-msgstr ""
++msgstr "_Sentreer"
+ 
+ #. Tooltip for Center menu entry
+ #: ../client/gtk/gui.c:360 ../editor/gtk/editor.c:1349
+ msgid "Center the map"
+-msgstr ""
++msgstr "Sentreer die kaart"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:364 ../client/gtk/gui.c:373 ../editor/gtk/editor.c:1300
+@@ -1644,7 +1638,7 @@
+ #. Menu entry
+ #: ../client/gtk/gui.c:367
+ msgid "_About Pioneers"
+-msgstr "Aangaande Pioniers"
++msgstr "_Aangaande Pioniers"
+ 
+ #. Tooltip for About Pioneers menu entry
+ #: ../client/gtk/gui.c:369
+@@ -1659,12 +1653,12 @@
+ #. Menu entry
+ #: ../client/gtk/gui.c:383 ../editor/gtk/editor.c:1367
+ msgid "_Fullscreen"
+-msgstr ""
++msgstr "_Volskerm"
+ 
+ #. Tooltip for Fullscreen menu entry
+ #: ../client/gtk/gui.c:386 ../editor/gtk/editor.c:1370
+ msgid "Set window to full screen mode"
+-msgstr ""
++msgstr "Stel die venster na volskerm modus"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:391
+@@ -1786,12 +1780,12 @@
+ #. Label for the option to disable all sounds
+ #: ../client/gtk/gui.c:1182
+ msgid "Silent mode"
+-msgstr ""
++msgstr "Stilmodus"
+ 
+ #. Tooltip for the option to disable all sounds
+ #: ../client/gtk/gui.c:1188
+ msgid "In silent mode no sounds are made"
+-msgstr ""
++msgstr "In stilmodus word geen klank gemaak nie"
+ 
+ #. Label for the option to announce when players/spectators enter
+ #: ../client/gtk/gui.c:1194
+@@ -1806,12 +1800,13 @@
+ #. Label for the option to use the notifications.
+ #: ../client/gtk/gui.c:1216
+ msgid "Show notifications"
+-msgstr ""
++msgstr "Wys aankondigings"
+ 
+ #. Tooltip for notifications option.
+ #: ../client/gtk/gui.c:1226
+ msgid "Show notifications when it's your turn or when new trade is available"
+ msgstr ""
++"Wys aankondigings wanneer dit jou beurt is of wanneer handel beskikbaar is"
+ 
+ #. Label for the option to use the 16:9 layout.
+ #: ../client/gtk/gui.c:1232
+@@ -1855,9 +1850,8 @@
+ 
+ #. Notification
+ #: ../client/gtk/interface.c:892
+-#, fuzzy
+ msgid "It is your turn to setup."
+-msgstr "Dit is jou beurt."
++msgstr "Dit is jou beurt om op te stel."
+ 
+ #: ../client/gtk/legend.c:33
+ msgid "Hill"
+@@ -1935,15 +1929,15 @@
+ #. Label: set player icon preferences
+ #: ../client/gtk/name.c:238
+ msgid "Variant:"
+-msgstr ""
++msgstr "Variant:"
+ 
+ #: ../client/gtk/offline.c:62
+ msgid "Connect as a spectator"
+ msgstr "Skakel in as 'n toeskouer"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
+-msgstr "Metabediener gasheer"
++msgid "Metaserver Host"
++msgstr "Metabediener masjien"
+ 
+ #: ../client/gtk/offline.c:79
+ msgid "Select a game to join."
+@@ -1994,11 +1988,11 @@
+ #. Name of the development card
+ #: ../client/gtk/player.c:59 ../common/cards.c:134
+ msgid "Pioneer university"
+-msgstr "Pionier Universiteit"
++msgstr "Pionier universiteit"
+ 
+ #: ../client/gtk/player.c:59
+ msgid "Pioneer universities"
+-msgstr "Pionier Universiteite"
++msgstr "Pionier universiteite"
+ 
+ #. Name of the development card
+ #: ../client/gtk/player.c:61 ../common/cards.c:137
+@@ -2080,19 +2074,19 @@
+ #: ../client/gtk/quote.c:217
+ #, c-format
+ msgid "New offer from %s."
+-msgstr ""
++msgstr "Nuwe aanbod van %s."
+ 
+ #. Notification
+ #: ../client/gtk/quote.c:242
+ #, c-format
+ msgid "Offer from %s."
+-msgstr ""
++msgstr "Aanbod van %s."
+ 
+ #. Label
+ #. Frame title, trade: I want to trade these resources
+ #: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524
+ msgid "I want"
+-msgstr ""
++msgstr "Ek vra"
+ 
+ #. Label
+ #. Frame title, trade: I want these resources in return
+@@ -2187,7 +2181,7 @@
+ #. Tooltip when the bank cannot be emptied
+ #: ../client/gtk/resource-table.c:307
+ msgid "The bank cannot be emptied"
+-msgstr "Die kleur kan nie geÃ¯nstalleer word nie."
++msgstr "Die bank kan nie leeggemaak word nie"
+ 
+ #: ../client/gtk/settingscreen.c:74
+ msgid "Yes"
+@@ -2224,16 +2218,15 @@
+ 
+ #: ../client/gtk/settingscreen.c:161
+ msgid "Allow trade between players:"
+-msgstr ""
++msgstr "Laat ruilhandel toe tussen spelers:"
+ 
+ #: ../client/gtk/settingscreen.c:166
+-#, fuzzy
+ msgid "Allow trade only before building or buying:"
+-msgstr "Word ruilhandel slegs toegelaat voor bou/koop?"
++msgstr "Laat ruilhandel slegs toe voor bou of koop:"
+ 
+ #: ../client/gtk/settingscreen.c:171
+ msgid "Check victory only at end of turn:"
+-msgstr ""
++msgstr "Toets slegs aan die einde van 'n beurt vir oorwinning:"
+ 
+ #: ../client/gtk/settingscreen.c:176
+ msgid "Amount of each resource:"
+@@ -2245,7 +2238,7 @@
+ 
+ #: ../client/gtk/settingscreen.c:196
+ msgid "Use the pirate to block ships:"
+-msgstr ""
++msgstr "Gebruik die seerower om skepe te blokkeer:"
+ 
+ #: ../client/gtk/settingscreen.c:225
+ msgid "Island discovery bonuses:"
+@@ -2278,7 +2271,7 @@
+ 
+ #: ../client/gtk/settingscreen.c:289
+ msgid "Bridges:"
+-msgstr ""
++msgstr "BrÃ»e:"
+ 
+ #. Label
+ #: ../client/gtk/settingscreen.c:302
+@@ -2303,7 +2296,7 @@
+ 
+ #: ../client/gtk/settingscreen.c:334
+ msgid "Pioneer university cards:"
+-msgstr "Pionier Universiteitkaarte:"
++msgstr "Pionier universiteitkaarte:"
+ 
+ #: ../client/gtk/settingscreen.c:338
+ msgid "Governor's house cards:"
+@@ -2348,13 +2341,13 @@
+ #: ../client/gtk/trade.c:242
+ #, c-format
+ msgid "I want %s, and give them %s"
+-msgstr "Ek wil %s hÃª en sal %s gee"
++msgstr "Ek vra %s en sal %s gee"
+ 
+ #. Notification
+ #: ../client/gtk/trade.c:348
+ #, c-format
+ msgid "Quote received from %s."
+-msgstr ""
++msgstr "Aanhaling ontvang vanaf %s."
+ 
+ #. Button text, trade: call for quotes from other players
+ #: ../client/gtk/trade.c:539
+@@ -2364,12 +2357,12 @@
+ #. Button text: Trade page, accept selected quote
+ #: ../client/gtk/trade.c:567
+ msgid "_Accept Quote"
+-msgstr "Aanvaar kwotasie"
++msgstr "_Aanvaar kwotasie"
+ 
+ #. Button text: Trade page, finish trading
+ #: ../client/gtk/trade.c:573
+ msgid "_Finish Trading"
+-msgstr "Stop met ruilhandel"
++msgstr "_Stop met ruilhandel"
+ 
+ #. Name of the development card
+ #: ../common/cards.c:122
+@@ -2384,7 +2377,7 @@
+ #. Description of the 'Road Building' development card
+ #: ../common/cards.c:157
+ msgid "Build two new roads"
+-msgstr ""
++msgstr "Bou twee nuwe paaie"
+ 
+ #. Description of the 'Monopoly' development card
+ #: ../common/cards.c:160
+@@ -2392,6 +2385,8 @@
+ "Select a resource type and take every card of that type held by all other "
+ "players"
+ msgstr ""
++"Kies 'n hulpbrontipe en kry dan al die kaarte van daardie tipe wat by ander "
++"spelers is"
+ 
+ #. Description of the 'Year of Plenty' development card
+ #: ../common/cards.c:164
+@@ -2399,11 +2394,13 @@
+ "Take two resource cards of any type from the bank (cards may be of the same "
+ "or different types)"
+ msgstr ""
++"Kies twee hulpbronkaarte van enige tipe by die bank (kaarte kan dieselfde "
++"wees of verskil)"
+ 
+ #. Description of a development card of 1 victory point
+ #: ../common/cards.c:173
+ msgid "One victory point"
+-msgstr ""
++msgstr "Een wenpunt"
+ 
+ #. Description of the 'Soldier' development card
+ #: ../common/cards.c:176
+@@ -2411,11 +2408,13 @@
+ "Move the robber to a different space and take one resource card from another "
+ "player adjacent to that space"
+ msgstr ""
++"Skuif die rower na 'n ander blok en neem dan een hulpbronkaart van een van "
++"die spelers wat langs daardie blok is"
+ 
+ #: ../common/game.c:499
+ #, c-format
+ msgid "Obsolete rule: '%s'\n"
+-msgstr ""
++msgstr "Verouderde reÃ«l: '%s'\n"
+ 
+ #: ../common/game.c:506
+ #, c-format
+@@ -2423,6 +2422,8 @@
+ "The game uses the new rule '%s', which is not yet supported. Consider "
+ "upgrading.\n"
+ msgstr ""
++"Die spel gebruik die nuwe reÃ«l '%s', wat nog nie ondersteun word nie. "
++"Oorweeg dit om op te gradeer.\n"
+ 
+ #: ../common/game.c:890 ../common/game.c:921
+ msgid "This game cannot be won."
+@@ -2430,7 +2431,7 @@
+ 
+ #: ../common/game.c:891
+ msgid "There is no land."
+-msgstr ""
++msgstr "Daar is geen land."
+ 
+ #: ../common/game.c:925
+ msgid "It is possible that this game cannot be won."
+@@ -2438,7 +2439,7 @@
+ 
+ #: ../common/game.c:931
+ msgid "This game can be won by only building all settlements and cities."
+-msgstr ""
++msgstr "Hierdie spel kans gewen word deur slegs alle dorpe en stede te bou."
+ 
+ #: ../common/game.c:937
+ #, c-format
+@@ -2450,6 +2451,12 @@
+ "Maximum island discovery bonus: %d\n"
+ "Total: %d"
+ msgstr ""
++"Wenpunte benodig: %d\n"
++"Punte verkry deur alles te bou: %d\n"
++"Punte in ontwikkelingskaarte: %d\n"
++"Langste pad/grootste weermag: %d+%d\n"
++"Maksimum bonus vir eilandontdekking: %d\n"
++"Totaal: %d"
+ 
+ #: ../common/gtk/aboutbox.c:76
+ msgid ""
+@@ -2457,7 +2464,7 @@
+ "Settlers of Catan board game.\n"
+ msgstr ""
+ "Pioniers is gebaseer op die uitstekende\n"
+-"bordspel \"Settlers of Catan\".\n"
++"bordspel Settlers of Catan.\n"
+ 
+ #: ../common/gtk/aboutbox.c:79
+ msgid "Version:"
+@@ -2471,6 +2478,7 @@
+ msgid "Authors:"
+ msgstr "Outeurs:"
+ 
++#
+ #. Translators: add your name here. Keep the list alphabetically,
+ #. * do not remove any names, and add \n after your name (except the last name).
+ #.
+@@ -2479,17 +2487,17 @@
+ msgstr ""
+ "Launchpad Contributions:\n"
+ "  Arthur Rilke https://launchpad.net/~arthurrilke\n";
+-"  petri.jooste https://launchpad.net/~petri-jooste";
++"  Petri Jooste https://launchpad.net/~petri-jooste";
+ 
+ #. Header for the translator_credits. Use your own language name
+ #: ../common/gtk/aboutbox.c:110
+ msgid "Pioneers is translated to <your language here> by:\n"
+-msgstr ""
++msgstr "Pioniers is in Afrikaans vertaal deur:\n"
+ 
+ #. Caption for result of checking victory points
+ #: ../common/gtk/common_gtk.c:321
+ msgid "Victory Point Analysis"
+-msgstr ""
++msgstr "Analise van wenpunte"
+ 
+ #. Tooltip for sevens rule normal
+ #: ../common/gtk/game-rules.c:99
+@@ -2520,16 +2528,15 @@
+ 
+ #: ../common/gtk/game-rules.c:122
+ msgid "Use the pirate to block ships"
+-msgstr ""
++msgstr "Gebruik die seerower om skepe te blokkeer"
+ 
+ #: ../common/gtk/game-rules.c:124
+ msgid "Strict trade"
+ msgstr "Streng handel"
+ 
+ #: ../common/gtk/game-rules.c:125
+-#, fuzzy
+ msgid "Allow trade only before building or buying"
+-msgstr "Word ruilhandel slegs toegelaat voor bou/koop?"
++msgstr "Laat ruilhandel slegs voor bou of koop toe"
+ 
+ #: ../common/gtk/game-rules.c:127
+ msgid "Domestic trade"
+@@ -2537,32 +2544,30 @@
+ 
+ #: ../common/gtk/game-rules.c:128
+ msgid "Allow trade between players"
+-msgstr ""
++msgstr "Laat ruilhandel toe tussen spelers"
+ 
+ #: ../common/gtk/game-rules.c:130
+ msgid "Victory at end of turn"
+-msgstr ""
++msgstr "Oorwinning aan die einde van 'n beurt"
+ 
+ #: ../common/gtk/game-rules.c:131
+ msgid "Check for victory only at end of turn"
+-msgstr ""
++msgstr "Toets slegs aan die einde van 'n beurt vir oorwinning"
+ 
+ #. Label
+ #: ../common/gtk/game-rules.c:135
+-#, fuzzy
+ msgid "Island discovery bonuses"
+-msgstr "Eiland-ontdekbonusse:"
++msgstr "Bonus vir eilandontdekking"
+ 
+ #. Tooltip for island bonus
+ #: ../common/gtk/game-rules.c:147
+ msgid "A comma separated list of bonus points for discovering islands"
+-msgstr ""
++msgstr "'n Lys, met kommas geskei, van bonuspunte vir ontdek van eilande"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
+-#, fuzzy
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+-msgstr "Eiland-ontdekbonusse:"
++msgstr "Kontrolleer eiland-ontdekking bonusse"
+ 
+ #. Label text for customising a game
+ #: ../common/gtk/game-settings.c:106
+@@ -2627,7 +2632,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Kies 'n meta-bediener"
+ 
+ #. Tooltip for the list of games
+@@ -2638,7 +2643,7 @@
+ #. Log prefix
+ #: ../common/log.c:55
+ msgid "*ERROR* "
+-msgstr "*Fout* "
++msgstr "*FOUT* "
+ 
+ #. Log prefix
+ #: ../common/log.c:63
+@@ -2733,12 +2738,12 @@
+ #. Log prefix
+ #: ../common/log.c:137
+ msgid "Spectator: "
+-msgstr ""
++msgstr "Toeskouer: "
+ 
+ #. Log prefix
+ #: ../common/log.c:141
+ msgid "** UNKNOWN MESSAGE TYPE ** "
+-msgstr "** Onbekende boodskaptipe ** "
++msgstr "** ONBEKENDE BOODSKAPTIPE ** "
+ 
+ #: ../common/network.c:315
+ #, c-format
+@@ -2849,7 +2854,7 @@
+ #. Error message
+ #: ../common/state.c:291
+ msgid "State stack overflow. Stack dump sent to standard error.\n"
+-msgstr "Statusstapel loop oor.  Stapel word gestort op standaardfoutafvoer.\n"
++msgstr "Statusstapel loop oor. Stapel word gestort op standaardfoutafvoer.\n"
+ 
+ #. Use an unique shortcut key for each resource
+ #: ../editor/gtk/editor.c:90
+@@ -2879,7 +2884,7 @@
+ #. Use an unique shortcut key for each resource
+ #: ../editor/gtk/editor.c:100
+ msgid "_Desert"
+-msgstr "Woest_yn"
++msgstr "_Woestyn"
+ 
+ #. Use an unique shortcut key for each resource
+ #: ../editor/gtk/editor.c:102
+@@ -2959,19 +2964,19 @@
+ 
+ #: ../editor/gtk/editor.c:230
+ msgid "Insert a row"
+-msgstr ""
++msgstr "Voeg 'n ry in"
+ 
+ #: ../editor/gtk/editor.c:231
+ msgid "Delete a row"
+-msgstr ""
++msgstr "Vee 'n ry uit"
+ 
+ #: ../editor/gtk/editor.c:232
+ msgid "Insert a column"
+-msgstr ""
++msgstr "Voeg 'n kolom in"
+ 
+ #: ../editor/gtk/editor.c:233
+ msgid "Delete a column"
+-msgstr ""
++msgstr "Vee 'n kolom uit"
+ 
+ #. Menu item
+ #: ../editor/gtk/editor.c:732
+@@ -3017,14 +3022,13 @@
+ 
+ #. Name of the file filter: show only games
+ #: ../editor/gtk/editor.c:1080
+-#, fuzzy
+ msgid "Games"
+-msgstr "_Spel"
++msgstr "Spelle"
+ 
+ #. Name of the file filter: show all files
+ #: ../editor/gtk/editor.c:1086
+ msgid "Unfiltered"
+-msgstr ""
++msgstr "Ongefilter"
+ 
+ #. Dialog caption
+ #: ../editor/gtk/editor.c:1098
+@@ -3098,7 +3102,7 @@
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1324
+ msgid "_Change Title"
+-msgstr "_Verander titel"
++msgstr "Verander _titel"
+ 
+ #. Tooltip for Change Title menu entry
+ #: ../editor/gtk/editor.c:1326
+@@ -3108,13 +3112,13 @@
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1329 ../server/gtk/main.c:98
+ msgid "_Check Victory Point Target"
+-msgstr ""
++msgstr "_Kontrolleer Wenpunt teiken"
+ 
+ #. Tooltip for Check Victory Point Target menu entry
+ #. Tooltop for Check Victory Point Target menu entry
+ #: ../editor/gtk/editor.c:1332 ../server/gtk/main.c:101
+ msgid "Check whether the game can be won"
+-msgstr "Kontrolleer of die spel gewen kan word"
++msgstr "Merk as die spel gewen kan word"
+ 
+ #. Tooltip for Quit menu entry
+ #: ../editor/gtk/editor.c:1337
+@@ -3129,7 +3133,7 @@
+ #. Tooltip for About Pioneers Editor menu entry
+ #: ../editor/gtk/editor.c:1361
+ msgid "Information about Pioneers Editor"
+-msgstr "Inligting oor Pioniersredigeerder"
++msgstr "Inligting oor die Pioniersredigeerder"
+ 
+ #. Long help for commandline option (editor): filename
+ #: ../editor/gtk/editor.c:1414
+@@ -3140,7 +3144,7 @@
+ #. Commandline meta-server: pidfile argument
+ #: ../editor/gtk/editor.c:1416 ../meta-server/main.c:1074
+ msgid "filename"
+-msgstr "LÃªernaam"
++msgstr "lÃªernaam"
+ 
+ #. Long description in the command line: --help
+ #: ../editor/gtk/editor.c:1451
+@@ -3161,7 +3165,7 @@
+ #. Tab page name
+ #: ../editor/gtk/editor.c:1528
+ msgid "Comments"
+-msgstr ""
++msgstr "Kommentaar"
+ 
+ #: ../editor/gtk/game-resources.c:48
+ msgid "Resource count"
+@@ -3169,21 +3173,21 @@
+ 
+ #: ../editor/gtk/pioneers-editor.desktop.in.h:2
+ msgid "Create your own game for Pioneers"
+-msgstr "Skep u eie spel vir Pioneers"
++msgstr "Skep u eie spel vir Pioniers"
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "Loop die metabediener in die agtergrond wanneer dit begin"
+ 
+ #. Commandline meta-server: pidfile
+ #: ../meta-server/main.c:1072
+ msgid "Pidfile to create when daemonizing (implies -d)"
+-msgstr ""
++msgstr "Pid-lÃªer om te skep wanneer bediener loop as daemon (impliseer -d)"
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Herlei kliÃ«nte na 'n ander metabediener"
+ 
+ #. Commandline meta-server: server
+@@ -3198,9 +3202,8 @@
+ 
+ #. Commandline meta-server: port-range
+ #: ../meta-server/main.c:1085
+-#, fuzzy
+ msgid "Use this port range when creating new games"
+-msgstr "Gebruik hierdie poortreeks wanneer nuwe spelle geskep word"
++msgstr "Gebruik hierdie poortreeks wanneer 'n nuwe spel geskep word"
+ 
+ #. Commandline meta-server: port-range argument
+ #: ../meta-server/main.c:1087
+@@ -3214,42 +3217,42 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Metabediener vir Pioniers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "metabediener protokol:"
+ 
+ #: ../server/avahi.c:68
+ msgid "Avahi registration successful.\n"
+-msgstr ""
++msgstr "Avahi-registrasie suksesvol.\n"
+ 
+ #: ../server/avahi.c:78
+ #, c-format
+ msgid "Avahi service name collision, renaming service to '%s'.\n"
+-msgstr ""
++msgstr "Avahi diensnaamteenstrydigheid; die diens word hernoem na '%s'.\n"
+ 
+ #. Some kind of failure happened while we were registering
+ #: ../server/avahi.c:89
+ #, c-format
+ msgid "Avahi error: %s\n"
+-msgstr ""
++msgstr "Avahi fout: %s\n"
+ 
+ #: ../server/avahi.c:113 ../server/avahi.c:147 ../server/avahi.c:157
+ #: ../server/avahi.c:193 ../server/avahi.c:214 ../server/avahi.c:228
+-#, fuzzy, c-format
++#, c-format
+ msgid "Avahi error: %s, %s\n"
+-msgstr "Fout (%s): %s\n"
++msgstr "Avahi fout: %s, %s\n"
+ 
+ #: ../server/avahi.c:215 ../server/avahi.c:229
+ msgid "Unable to register Avahi server"
+-msgstr ""
++msgstr "Kan nie Avahi-bediener registreer nie"
+ 
+ #: ../server/avahi.c:262
+ msgid "Unregistering Avahi.\n"
+-msgstr ""
++msgstr "Deregistreer tans Avahi.\n"
+ 
+ #. Menu entry
+ #: ../server/gtk/main.c:109
+@@ -3302,7 +3305,7 @@
+ msgstr "Registreer bediener"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registreer hierdie spel by die metabediener"
+ 
+ #. hostname label
+@@ -3314,14 +3317,13 @@
+ msgid ""
+ "The public name of this computer (needed when playing behind a firewall)"
+ msgstr ""
+-"Publieke naam van hierdie rekenaar (nodig wanneer van agter 'n netskans "
+-"\"firewall\" gespeel word)"
++"Publieke naam van hierdie rekenaar (nodig wanneer van agter 'n brandmuur "
++"gespeel word)"
+ 
+ #. random toggle
+ #: ../server/gtk/main.c:629
+-#, fuzzy
+ msgid "Random turn order"
+-msgstr "Maak beurtvolgorde deurmekaar"
++msgstr "Ewekansige beurtvolgorde"
+ 
+ #: ../server/gtk/main.c:636
+ msgid "Randomize turn order"
+@@ -3385,12 +3387,12 @@
+ #. Button text
+ #: ../server/gtk/main.c:801
+ msgid "Launch Pioneers Client"
+-msgstr "Lanseer Pioneers-kliÃ«nt"
++msgstr "Lanseer Pioniers-kliÃ«nt"
+ 
+ #. Tooltip
+ #: ../server/gtk/main.c:809
+ msgid "Launch the Pioneers client"
+-msgstr "Lanseer die Pioneers-kliÃ«nt"
++msgstr "Lanseer die Pioniers-kliÃ«nt"
+ 
+ #. ai chat toggle
+ #: ../server/gtk/main.c:843
+@@ -3450,6 +3452,7 @@
+ msgid "The Pioneers Game Server"
+ msgstr "Die Pioniers-spelbediener"
+ 
++#
+ #. Wait for all players to disconnect,
+ #. * then enable the UI
+ #.
+@@ -3470,7 +3473,7 @@
+ 
+ #: ../server/gtk/pioneers-server.desktop.in.h:2
+ msgid "Host a game of Pioneers"
+-msgstr "Speel gasheer vir 'n spel Pioneers"
++msgstr "Speel gasheer vir 'n Pioniersspel"
+ 
+ #. Commandline server-console: game-title
+ #: ../server/main.c:76
+@@ -3514,12 +3517,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registreer bediener by metabediener"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registreer by die metabediener (impliseer -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3559,12 +3562,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Opsies vir die metabediener"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Opsies vir die metabediener"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3581,7 +3584,7 @@
+ #: ../server/main.c:225
+ #, c-format
+ msgid "Cannot set game title and filename at the same time\n"
+-msgstr ""
++msgstr "Kan nie die speltitel en lÃªernaam terselfdertyd verander nie\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:242
+@@ -3592,8 +3595,9 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
+ msgstr ""
++"Die netwerkpoort (%s) vir die admin-koppelvlak is nie beskikbaar nie.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3603,12 +3607,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registreer by metabediener %s, poort %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registreer by metabediener %s, poort %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Verbreek koppeling met meta-bediener\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Deregistreer by die metabediener.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+@@ -3624,11 +3628,11 @@
+ 
+ #: ../server/player.c:226 ../server/player.c:296
+ msgid "The last player left, the tournament timer is reset."
+-msgstr ""
++msgstr "Die laaste speler is weg, die toernooitydhouer is herstel."
+ 
+ #: ../server/player.c:260 ../server/player.c:637
+ msgid "No human players present. Bye."
+-msgstr ""
++msgstr "Geen menslike spelers teenwoordig nie. Totsiens."
+ 
+ #: ../server/player.c:267
+ msgid "Game starts, adding computer players."
+@@ -3644,6 +3648,7 @@
+ msgid "The game starts in %s minute."
+ msgstr "Die spel begin oor %s minuut."
+ 
++#
+ #. Default name for the AI when the computer_names file
+ #. * is not found or empty.
+ #.
+@@ -3666,15 +3671,16 @@
+ 
+ #: ../server/player.c:632 ../server/server.c:43
+ msgid "Was hanging around for too long without players... bye.\n"
+-msgstr ""
++msgstr "Het te lank gewag sonder spelers... totsiens.\n"
+ 
+ #: ../server/player.c:716
+ msgid "The last human player left. Waiting for the return of a player."
+ msgstr ""
++"Die laaste menslike speler is weg. Wag tans vir 'n speler om terug te kom."
+ 
+ #: ../server/player.c:737
+ msgid "Resuming the game."
+-msgstr ""
++msgstr "Die spel word hervat."
+ 
+ #. %s is the name of the reconnecting player
+ #: ../server/player.c:868
+@@ -3699,7 +3705,7 @@
+ #: ../server/server.c:388 ../server/server.c:477
+ #, c-format
+ msgid "Looking for games in '%s'\n"
+-msgstr ""
++msgstr "Kyk tans vir spelle in '%s'\n"
+ 
+ #: ../server/server.c:390 ../server/server.c:479
+ #, c-format
+@@ -3721,7 +3727,7 @@
+ #. Cheat mode has been activated
+ #: ../server/turn.c:493
+ msgid "The dice roll has been determined by the administrator."
+-msgstr ""
++msgstr "Die kies van kansgetalle is bepaal deur die administrateur."
+ 
+ #~ msgid "Viewer %d"
+ #~ msgstr "Toeskouer %d"
+diff -u --label pioneers-14.1.orig/po/ca.po --label pioneers-14.1/po/ca.po 	     .pc/svn1860-2091_po.diff/po/ca.po po/ca.po
+Index: pioneers-14.1/po/ca.po
+===================================================================
+--- pioneers-14.1.orig/po/ca.po
++++ pioneers-14.1/po/ca.po
+@@ -5,10 +5,10 @@
+ # Jaume Badiella Aguilera <myotis@drac.com>, 2013.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2013-01-20 20:01+0100\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-15 18:04+0200\n"
+ "Last-Translator: Jaume Badiella Aguilera <myotis@drac.com>\n"
+ "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+ "Language: ca\n"
+@@ -16,7 +16,7 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Launchpad-Export-Date: 2010-03-11 19:48+0000\n"
+-"X-Generator: Lokalize 1.4\n"
++"X-Generator: Lokalize 1.5\n"
+ "Plural-Forms: nplurals=2; plural=(n!=1)\n"
+ 
+ #. Commandline pioneersai: server
+@@ -37,7 +37,7 @@
+ #. Commandline pioneersai: time
+ #: ../client/ai/ai.c:79
+ msgid "Time to wait between turns (in milliseconds)"
+-msgstr "Temps d'espera entre torns (en milisegons)"
++msgstr "Temps d'espera entre torns (en milÂ·lisegons)"
+ 
+ #. Commandline pioneersai: chat-free
+ #: ../client/ai/ai.c:82
+@@ -136,7 +136,7 @@
+ #. AI chat when one resource is received
+ #: ../client/ai/greedy.c:1322
+ msgid "One is better than none..."
+-msgstr "Un millor que cap..."
++msgstr "Una millor que cap..."
+ 
+ #. AI chat when more than one resource is received
+ #: ../client/ai/greedy.c:1327
+@@ -171,7 +171,7 @@
+ #. AI chat when it moves the robber
+ #: ../client/ai/greedy.c:1345
+ msgid "Hehe!"
+-msgstr "Hehe!"
++msgstr "He he!"
+ 
+ #. AI chat when it moves the robber
+ #: ../client/ai/greedy.c:1347
+@@ -308,8 +308,8 @@
+ "Hello, welcome to the lobby. I am a simple robot. Type '/help' in the chat "
+ "to see the list of commands I know."
+ msgstr ""
+-"Hola, benvingut/da a la sala. SÃ³c un simple robot. Escriu '/help' al xat per "
+-"veure la llista d'ordres que conec."
++"Hola, benvingut/da a la sala. SÃ³c un simple robot. Escriu '/help' a la "
++"conversa per veure la llista d'ordres que conec."
+ 
+ #. Translators: don't translate '/help'
+ #: ../client/ai/lobbybot.c:107
+@@ -324,7 +324,7 @@
+ #. Translators: don't translate '/news'
+ #: ../client/ai/lobbybot.c:113
+ msgid "'/news' tells the last released version"
+-msgstr "'/news' quina Ã©s la darrera versiÃ³ apareguda"
++msgstr "'/news' explica quina Ã©s la darrera versiÃ³ apareguda"
+ 
+ #. AI chat that explains '/why'
+ #: ../client/ai/lobbybot.c:119
+@@ -407,17 +407,17 @@
+ #: ../client/common/client.c:734
+ #, c-format
+ msgid "%s is refunded %s.\n"
+-msgstr "Es retorna %2s a %1s.\n"
++msgstr "A %s, li retornen %s.\n"
+ 
+ #: ../client/common/client.c:765
+ #, c-format
+ msgid "%s discarded %s.\n"
+-msgstr "%s descarta %s.\n"
++msgstr "%s ha descartat %s.\n"
+ 
+ #: ../client/common/client.c:839
+ #, c-format
+ msgid "%s has won the game with %d victory points!\n"
+-msgstr "%s ha guanyat la partida amb %d punts!\n"
++msgstr "%s ha guanyat la partida amb %d punts de victÃ²ria!\n"
+ 
+ #: ../client/common/client.c:938
+ msgid "Loading"
+@@ -430,12 +430,12 @@
+ #: ../client/common/client.c:985
+ msgid "Version mismatch. Please make sure client and server are up to date.\n"
+ msgstr ""
+-"La versiÃ³ no coincideix, assegura't que tant el client com el servidor estan "
++"La versiÃ³ no coincideix. Assegura't que tant el client com el servidor estan "
+ "actualitzats, si et plau.\n"
+ 
+ #: ../client/common/client.c:1410
+ msgid "Build two settlements, each with a connecting"
+-msgstr "Construeix dos pobles, cadascun connectats amb un"
++msgstr "Construeix dos pobles, connectats cadascun amb un"
+ 
+ #: ../client/common/client.c:1413
+ msgid "Build a settlement with a connecting"
+@@ -459,7 +459,7 @@
+ 
+ #: ../client/common/client.c:1491
+ msgid "Waiting for your turn."
+-msgstr "Esperant el teu torn."
++msgstr "S'estÃ  esperant el teu torn."
+ 
+ #: ../client/common/client.c:1543 ../client/gtk/interface.c:758
+ msgid "Select the building to steal from."
+@@ -611,20 +611,20 @@
+ #: ../client/common/player.c:324
+ #, c-format
+ msgid "Waiting for %s."
+-msgstr "Esperant %s."
++msgstr "S'estÃ  esperant %s."
+ 
+ #. We are not in on the action
+ #. someone stole a resource from someone else
+ #: ../client/common/player.c:352
+ #, c-format
+ msgid "%s stole a resource from %s.\n"
+-msgstr "%s li ha robat un recurs a %s.\n"
++msgstr "%s ha robat un recurs a %s.\n"
+ 
+ #. $1=resource, $2=player name
+ #: ../client/common/player.c:363
+ #, c-format
+ msgid "You stole %s from %s.\n"
+-msgstr "Li has robat %s a %s.\n"
++msgstr "Has robat %s a %s.\n"
+ 
+ #. $1=player name, $2=resource
+ #: ../client/common/player.c:370
+@@ -635,18 +635,18 @@
+ #: ../client/common/player.c:404
+ #, c-format
+ msgid "%s gave %s nothing!?\n"
+-msgstr "%s no li ha donat res a %s!?\n"
++msgstr "%s no ha donat res a %s!?\n"
+ 
+ #. $1=giving player, $2=receiving player, $3=resources
+ #: ../client/common/player.c:411 ../client/common/player.c:421
+ #, c-format
+ msgid "%s gave %s %s for free.\n"
+-msgstr "%1s li ha donat %3s a %2s de franc.\n"
++msgstr "%s ha donat %s a %s de franc.\n"
+ 
+ #: ../client/common/player.c:429
+ #, c-format
+ msgid "%s gave %s %s in exchange for %s.\n"
+-msgstr "%1s li ha donat %3s a %2s a canvi de %4s.\n"
++msgstr "%s ha donat %s a %s a canvi de %s.\n"
+ 
+ #: ../client/common/player.c:460
+ #, c-format
+@@ -832,7 +832,7 @@
+ #: ../client/common/resource.c:47
+ #, c-format
+ msgid "%d brick cards"
+-msgstr "%d cartes de maons"
++msgstr "%d cartes de maÃ³"
+ 
+ #: ../client/common/resource.c:48
+ msgid "a grain card"
+@@ -971,8 +971,8 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
+-msgstr "Meta-servidor a %s, port %s"
++msgid "Metaserver at %s, port %s"
++msgstr "Metaservidor a %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+ msgid "Finished.\n"
+@@ -980,17 +980,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "El Meta-servidor ens ha expulsat\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "El metaservidor ha tancat la connexiÃ³ inesperadament.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "S'estan rebent noms de partides del metaservidor.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "S?ha requerit un nou servidor de joc a %s, port %s.\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "S'ha requerit un nou servidor de joc a %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -998,8 +998,8 @@
+ msgstr "Missatge desconegut del metaservidor: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Massa redireccions del meta-servidor\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Massa redireccions del metaservidor.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1008,8 +1008,8 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
+-msgstr "El meta servidor Ã©s massa vell per crear servidors (versiÃ³ %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
++msgstr "El metaservidor Ã©s massa vell per crear servidors (versiÃ³ %d.%d)\n"
+ 
+ #. Sevens rule: normal
+ #: ../client/gtk/connect.c:594 ../client/gtk/settingscreen.c:181
+@@ -1039,12 +1039,12 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "S'ha redireccionat al meta-servidor a %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "S'ha redireccionat al metaservidor a %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
+-msgstr "S'estÃ  rebent una llista de servidors Pioneers del meta servidor.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
++msgstr "S'estÃ  rebent una llista de servidors Pioneers del metaservidor.\n"
+ 
+ #: ../client/gtk/connect.c:708
+ msgid ""
+@@ -1067,8 +1067,8 @@
+ msgstr "El nombre de jugadors artificials"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "S'estÃ  demanant un nou servidor de joc\n"
++msgid "Requesting new game server.\n"
++msgstr "S'estÃ  demanant un nou servidor de joc.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1097,8 +1097,8 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
+-msgstr "Crea una nova partida pÃºblica al meta servidor"
++msgid "Create a new public game at the metaserver"
++msgstr "Crea una nova partida pÃºblica al metaservidor"
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:984
+@@ -1250,8 +1250,8 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
+-msgstr "Meta servidor"
++msgid "Metaserver"
++msgstr "Metaservidor"
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1351
+@@ -1937,8 +1937,8 @@
+ msgstr "Connecta't com a espectador"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
+-msgstr "Servidor meta-servidor"
++msgid "Metaserver Host"
++msgstr "Servidor metaservidor"
+ 
+ #: ../client/gtk/offline.c:79
+ msgid "Select a game to join."
+@@ -2564,7 +2564,7 @@
+ "d'illes"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Comprova i corregeix les bonificacions per descobriment d'illes"
+ 
+@@ -2631,8 +2631,8 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
+-msgstr "Selecciona un meta servidor"
++msgid "Select a metaserver"
++msgstr "Selecciona un metaservidor"
+ 
+ #. Tooltip for the list of games
+ #: ../common/gtk/select-game.c:104
+@@ -3103,7 +3103,7 @@
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1324
+ msgid "_Change Title"
+-msgstr "_Canvia el TÃtol"
++msgstr "_Canvi de TÃtol"
+ 
+ #. Tooltip for Change Title menu entry
+ #: ../editor/gtk/editor.c:1326
+@@ -3178,8 +3178,8 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
+-msgstr "Demonitza el meta-servidor en iniciar"
++msgid "Daemonize the metaserver on start"
++msgstr "Demonitza el metaservidor en iniciar"
+ 
+ #. Commandline meta-server: pidfile
+ #: ../meta-server/main.c:1072
+@@ -3188,8 +3188,8 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
+-msgstr "Redirecciona els clients a un altre meta-servidor"
++msgid "Redirect clients to another metaserver"
++msgstr "Redirecciona els clients a un altre metaservidor"
+ 
+ #. Commandline meta-server: server
+ #: ../meta-server/main.c:1080
+@@ -3218,13 +3218,13 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
+-msgstr "- Meta servidor de Pioneers"
++msgid "- Metaserver for Pioneers"
++msgstr "- Metaservidor de Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
+-msgstr "protocol del meta-servidor:"
++msgid "metaserver protocol:"
++msgstr "protocol del metaservidor:"
+ 
+ #: ../server/avahi.c:68
+ msgid "Avahi registration successful.\n"
+@@ -3306,8 +3306,8 @@
+ msgstr "Registra el servidor"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
+-msgstr "Registra aquesta partida al meta servidor"
++msgid "Register this game at the metaserver"
++msgstr "Registra aquesta partida al metaservidor"
+ 
+ #. hostname label
+ #: ../server/gtk/main.c:595
+@@ -3517,13 +3517,13 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
+-msgstr "Registra el servidor amb el meta-servidor"
++msgid "Register server with metaserver"
++msgstr "Registra el servidor amb el metaservidor"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
+-msgstr "Registra't al nom del meta-servidor (implica -r)"
++msgid "Register at metaserver name (implies -r)"
++msgstr "Registra't al nom del metaservidor (implica -r)"
+ 
+ #. Commandline server-console: hostname
+ #: ../server/main.c:114
+@@ -3563,13 +3563,13 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
+-msgstr "Opcions del Meta-servidor"
++msgid "Metaserver Options"
++msgstr "Opcions del Metaservidor"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
+-msgstr "Opcions del el meta-servidor"
++msgid "Options for the metaserver"
++msgstr "Opcions del el metaservidor"
+ 
+ #. Commandline server-console: Short description of misc group
+ #: ../server/main.c:193
+@@ -3596,8 +3596,9 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "El port d'administraciÃ³ no estÃ  disponible.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr ""
++"El port de xarxa (%s) de la interfÃcie d'administraciÃ³ no estÃ  disponible.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3609,12 +3610,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registra't amb el meta-servidor a %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registra't amb el meta-servidor a %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Desregistra't del meta-servidor\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Desregistra't del metaservidor\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/cs.po --label pioneers-14.1/po/cs.po 	     .pc/svn1860-2091_po.diff/po/cs.po po/cs.po
+Index: pioneers-14.1/po/cs.po
+===================================================================
+--- pioneers-14.1.orig/po/cs.po
++++ pioneers-14.1/po/cs.po
+@@ -2,7 +2,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2010-03-28 01:29+0000\n"
+ "Last-Translator: Ladislav Dobias <Unknown>\n"
+ "Language-Team: \n"
+@@ -966,7 +966,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Meta server na adrese %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -975,17 +975,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Meta server nÃ¡s vykopl\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Meta server nÃ¡s vykopl.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "ZÃskÃ¡vÃ¡m jmÃ©na her z meta serveru.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "NovÃ½ hernÃ server  poÅ¾adovÃ¡n na adrese %s, port %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "NovÃ½ hernÃ server  poÅ¾adovÃ¡n na adrese %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -993,8 +993,8 @@
+ msgstr "NeznÃ¡mÃ¡ zprÃ¡va z meta serveru: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Velmi mnoho pÅ?esmÄ?rovÃ¡nÃ na meta serveru\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Velmi mnoho pÅ?esmÄ?rovÃ¡nÃ na meta serveru.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1003,7 +1003,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Meta server je moc starÃ½ na vytvÃ¡Å?enÃ serverÅ¯ (verze %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1034,11 +1034,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "PÅ?esmÄ?rovÃ¡no na meta server %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "PÅ?esmÄ?rovÃ¡no na meta server %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "ZÃskÃ¡vÃ¡m seznam serverÅ¯ Pioneers z meta serveru.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1062,8 +1062,8 @@
+ msgstr "PoÄ?et poÄ?ÃtaÄ?ovÃ½ch hrÃ¡Ä?Å¯"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "PoÅ¾adovÃ¡n novÃ½ hracÃ server\n"
++msgid "Requesting new game server.\n"
++msgstr "PoÅ¾adovÃ¡n novÃ½ hracÃ server.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, fuzzy, c-format
+@@ -1092,7 +1092,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "VytvoÅ?it novou veÅ?ejnou hru na meta serveru"
+ 
+ #. Tooltip
+@@ -1247,7 +1247,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta server"
+ 
+ #. Button
+@@ -1938,7 +1938,7 @@
+ msgstr "PÅ?ipojit jako pozorovatel"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Adresa meta serveru"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2561,7 +2561,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ #, fuzzy
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Bonusy za objevenÃ ostrova:"
+@@ -2629,7 +2629,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr ""
+ 
+ #. Tooltip for the list of games
+@@ -3178,7 +3178,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr ""
+ 
+ #. Commandline meta-server: pidfile
+@@ -3188,7 +3188,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr ""
+ 
+ #. Commandline meta-server: server
+@@ -3218,12 +3218,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Pioneers Meta server"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr ""
+ 
+ #: ../server/avahi.c:68
+@@ -3307,7 +3307,7 @@
+ msgstr "Registrovat server"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registruje server na meta serveru"
+ 
+ #. hostname label
+@@ -3520,12 +3520,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registrovat server na meta serveru"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registruje server na meta serveru (zahrnuje -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3565,12 +3565,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "MoÅ¾nosti meta serveru"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "MoÅ¾nosti pro meta server"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3598,7 +3598,7 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, fuzzy, c-format
+-msgid "Admin port not available.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
+ msgstr "PromiÅ?te, dostupno je pouze %s.\n"
+ 
+ #. server-console commandline error
+@@ -3609,12 +3609,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registrovat na meta serveru na adrese %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registrovat na meta serveru na adrese %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Odregistrovat od meta serveru\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Odregistrovat od meta serveru.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/da.po --label pioneers-14.1/po/da.po 	     .pc/svn1860-2091_po.diff/po/da.po po/da.po
+Index: pioneers-14.1/po/da.po
+===================================================================
+--- pioneers-14.1.orig/po/da.po
++++ pioneers-14.1/po/da.po
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.11.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2008-04-29 09:36+0000\n"
+ "Last-Translator: carson\n"
+ "Language-Team: Danish <da@li.org>\n"
+@@ -971,7 +971,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Mataserver pÃ¥ %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -980,17 +980,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
+ msgstr "Mataserver smed os af\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Modtager spilnavne fra metaserveren.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Ny spilserver anmodning pÃ¥ %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Ny spilserver anmodning pÃ¥ %s port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -998,8 +998,8 @@
+ msgstr "Ukendt meddelelse fra metaserveren: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "For mange metaserver omdirigeringer\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "For mange metaserver omdirigeringer.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1008,7 +1008,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Metaserver for gammel til at lave servere (version %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1039,11 +1039,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Omdirigeret til metaserver %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Omdirigeret til metaserver %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Modtager en liste over Pioneer servere fra metaserveren.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1069,8 +1069,8 @@
+ msgstr "Antallet af spillere"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Anmoder om ny spilserver\n"
++msgid "Requesting new game server.\n"
++msgstr "Anmoder om ny spilserver.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, fuzzy, c-format
+@@ -1100,7 +1100,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Skab et nyt offentligt spil pÃ¥ metaserveren"
+ 
+ #. Tooltip
+@@ -1255,7 +1255,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaserver"
+ 
+ #. Button
+@@ -1946,7 +1946,7 @@
+ msgstr "Deltag som seer"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Metaserver vÃ¦rt"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2567,8 +2567,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
+-#, fuzzy
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Bonus for opdagelse af Ã¸:"
+ 
+@@ -2635,7 +2634,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Start meta server"
+ 
+ #. Tooltip for the list of games
+@@ -3183,7 +3182,7 @@
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+ #, fuzzy
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "KÃ¸r metaserver i baggrund ved start"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3194,7 +3193,7 @@
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+ #, fuzzy
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Omdiriger klienter til en anden metaserver"
+ 
+ #. Commandline meta-server: server
+@@ -3224,12 +3223,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Metaserver for Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, fuzzy, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "metaserver protekol:"
+ 
+ #: ../server/avahi.c:68
+@@ -3312,7 +3311,7 @@
+ msgstr "Registrer server"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registrer dette spil pÃ¥ metaserveren"
+ 
+ #. hostname label
+@@ -3526,12 +3525,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registrer server hos metaserver"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr ""
+ 
+ #. Commandline server-console: hostname
+@@ -3572,12 +3571,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Metaserver muligheder"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "OpsÃ¦tning af metaserver"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3604,9 +3603,9 @@
+ 
+ #. Error message
+ #: ../server/main.c:275
+-#, fuzzy, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Beklager, %s tilgÃ¦ngelig.\n"
++#, c-format
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr ""
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3616,12 +3615,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registrer med metaserver %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registrer med metaserver %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Afregistrerer fra metaserver\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Afregistrerer fra metaserver.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/de.po --label pioneers-14.1/po/de.po 	     .pc/svn1860-2091_po.diff/po/de.po po/de.po
+Index: pioneers-14.1/po/de.po
+===================================================================
+--- pioneers-14.1.orig/po/de.po
++++ pioneers-14.1/po/de.po
+@@ -9,18 +9,18 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.5\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2012-06-25 00:22+0000\n"
+-"Last-Translator: Flames_in_Paradise <Unknown>\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-29 09:39+0100\n"
++"Last-Translator: Roland Clobus <rclobus@rclobus.nl>\n"
+ "Language-Team: Pit Garbe <piiit@gmx.de>, Roman Hodek <roman@hodek.net>, de "
+ "<de@li.org>\n"
++"Language: de\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-Launchpad-Export-Date: 2012-09-06 06:01+0000\n"
+-"X-Generator: Launchpad (build 15909)\n"
+-"Language: de\n"
++"X-Generator: Poedit 1.5.4\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -974,7 +974,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Metaserver auf %s, Port %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -983,17 +983,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
+ msgstr "Metaserver hat die Verbindung beendet.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Empfange Spielenamen vom Metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Neuer Spielserver angefordert auf %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Neuer Spielserver angefordert auf %s Port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -1001,8 +1001,8 @@
+ msgstr "Unbekannte Nachricht vom Metaserver: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Zu viele Metaserver-Weiterleitungen\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Zu viele Metaserver-Weiterleitungen.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1011,7 +1011,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Metaserver zu alt, um Spielserver zu starten (Version %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1042,11 +1042,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Weitergeleitet zu Metaserver auf %s, Port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Weitergeleitet zu Metaserver auf %s, Port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Empfange eine Liste von Pioneers-Servern vom Metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1070,8 +1070,8 @@
+ msgstr "Die Anzahl der Computerspieler"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Anfrage fÃ¼r einen neuen Spielserver gesendet\n"
++msgid "Requesting new game server.\n"
++msgstr "Anfrage fÃ¼r einen neuen Spielserver gesendet.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1100,7 +1100,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Neues Ã¶ffentliches Spiel auf dem Metaserver erstellen"
+ 
+ #. Tooltip
+@@ -1253,7 +1253,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaserver"
+ 
+ #. Button
+@@ -1942,7 +1942,7 @@
+ msgstr "Als Zuschauer verbinden"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Metaserver-Rechner"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2420,7 +2420,7 @@
+ #: ../common/game.c:499
+ #, c-format
+ msgid "Obsolete rule: '%s'\n"
+-msgstr ""
++msgstr "Veraltete Regel: '%s'\n"
+ 
+ #: ../common/game.c:506
+ #, c-format
+@@ -2428,6 +2428,8 @@
+ "The game uses the new rule '%s', which is not yet supported. Consider "
+ "upgrading.\n"
+ msgstr ""
++"Das Spiel verwendet die neue Regel '%s', die noch nicht unterstÃ¼tzt ist. "
++"Aktualisierung ist empfohlen.\n"
+ 
+ #: ../common/game.c:890 ../common/game.c:921
+ msgid "This game cannot be won."
+@@ -2579,7 +2581,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr ""
+ 
+@@ -2646,7 +2648,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Einen Metaserver auswÃ¤hlen"
+ 
+ #. Tooltip for the list of games
+@@ -3191,20 +3193,20 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
+-msgstr "Starte Meta-Server beim Programmstart als eigenstÃ¤ndigen Prozess"
++msgid "Daemonize the metaserver on start"
++msgstr "Starte Metaserver beim Programmstart als eigenstÃ¤ndigen Prozess"
+ 
+ #. Commandline meta-server: pidfile
+ #: ../meta-server/main.c:1072
+ msgid "Pidfile to create when daemonizing (implies -d)"
+ msgstr ""
+-"Zu erstellende Pid-Datei, wenn Meta-Server als eigenstÃ¤ndiger Prozess "
++"Zu erstellende Pid-Datei, wenn Metaserver als eigenstÃ¤ndiger Prozess "
+ "gestartet wird (bewirkt -d)"
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
+-msgstr "Verbinde Clients mit anderem Meta-Server"
++msgid "Redirect clients to another metaserver"
++msgstr "Verbinde Clients mit anderem Metaserver"
+ 
+ #. Commandline meta-server: server
+ #: ../meta-server/main.c:1080
+@@ -3233,13 +3235,13 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Metaserver fÃ¼r Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
+-msgstr "Protokoll des Meta-Servers:"
++msgid "metaserver protocol:"
++msgstr "Protokoll des Metaservers:"
+ 
+ #: ../server/avahi.c:68
+ msgid "Avahi registration successful.\n"
+@@ -3321,7 +3323,7 @@
+ msgstr "Server registrieren"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Dieses Spiel beim Metaserver registrieren"
+ 
+ #. hostname label
+@@ -3532,12 +3534,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Server beim Metaserver registrieren"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Bei ausgewÃ¤hltem Metaserver registrieren (impliziert -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3579,12 +3581,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Metaserver-Optionen"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Optionen fÃ¼r den Metaserver"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3613,8 +3615,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Administrator Port nicht verfÃ¼gbar.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "Administrator Port (%s) nicht verfÃ¼gbar.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3625,12 +3627,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registriere bei Metaserver %s Port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registriere bei Metaserver %s Port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Beim Meta-Server austragen\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Beim Metaserver austragen.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/en_GB.po --label pioneers-14.1/po/en_GB.po 	     .pc/svn1860-2091_po.diff/po/en_GB.po po/en_GB.po
+Index: pioneers-14.1/po/en_GB.po
+===================================================================
+--- pioneers-14.1.orig/po/en_GB.po
++++ pioneers-14.1/po/en_GB.po
+@@ -6,10 +6,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2011-10-22 15:31+0100\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-08 17:12+0100\n"
+ "Last-Translator: Roland Clobus <rclobus@rclobus.nl>\n"
+ "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+ "Language: en_GB\n"
+@@ -17,10 +17,8 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Launchpad-Export-Date: 2010-03-11 19:44+0000\n"
+-"X-Generator: Launchpad (build Unknown)\n"
+-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+-"X-Poedit-Language: English\n"
+-"X-Poedit-Country: UNITED KINGDOM\n"
++"X-Generator: Poedit 1.5.4\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -972,8 +970,8 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
+-msgstr "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
++msgstr "Metaserver at %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+ msgid "Finished.\n"
+@@ -981,17 +979,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Meta-server kicked us off\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "The metaserver closed the connection unexpectedly.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
+-msgstr "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
++msgstr "Receiving game names from the metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "New game server requested on %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "New game server requested on %s port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -999,8 +997,8 @@
+ msgstr "Unknown message from the metaserver: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Too many meta-server redirects\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Too many metaserver redirects.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1009,8 +1007,8 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
+-msgstr "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
++msgstr "The metaserver is too old to create servers (version %d.%d)\n"
+ 
+ #. Sevens rule: normal
+ #: ../client/gtk/connect.c:594 ../client/gtk/settingscreen.c:181
+@@ -1040,12 +1038,12 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Redirected to meta-server at %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Redirected to the metaserver at %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
+-msgstr "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
++msgstr "Receiving a list of Pioneers servers from the metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:708
+ msgid ""
+@@ -1068,8 +1066,8 @@
+ msgstr "The number of computer players"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Requesting new game server\n"
++msgid "Requesting new game server.\n"
++msgstr "Requesting new game server.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1098,8 +1096,8 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
+-msgstr "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
++msgstr "Create a new public game at the metaserver"
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:984
+@@ -1251,8 +1249,8 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
+-msgstr "Meta server"
++msgid "Metaserver"
++msgstr "Metaserver"
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1351
+@@ -1937,8 +1935,8 @@
+ msgstr "Connect as a spectator"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
+-msgstr "Meta-server Host"
++msgid "Metaserver Host"
++msgstr "Metaserver Host"
+ 
+ #: ../client/gtk/offline.c:79
+ msgid "Select a game to join."
+@@ -2564,7 +2562,7 @@
+ msgstr "A comma separated list of bonus points for discovering islands"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Check and correct island discovery bonuses"
+ 
+@@ -2631,8 +2629,8 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
+-msgstr "Select a meta server"
++msgid "Select a metaserver"
++msgstr "Select a metaserver"
+ 
+ #. Tooltip for the list of games
+ #: ../common/gtk/select-game.c:104
+@@ -3176,8 +3174,8 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
+-msgstr "Daemonise the meta-server on start"
++msgid "Daemonize the metaserver on start"
++msgstr "Daemonise the metaserver on start"
+ 
+ #. Commandline meta-server: pidfile
+ #: ../meta-server/main.c:1072
+@@ -3186,8 +3184,8 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
+-msgstr "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
++msgstr "Redirect clients to another metaserver"
+ 
+ #. Commandline meta-server: server
+ #: ../meta-server/main.c:1080
+@@ -3216,13 +3214,13 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
+-msgstr "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
++msgstr "- Metaserver for Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
+-msgstr "meta-server protocol:"
++msgid "metaserver protocol:"
++msgstr "metaserver protocol:"
+ 
+ #: ../server/avahi.c:68
+ msgid "Avahi registration successful.\n"
+@@ -3304,8 +3302,8 @@
+ msgstr "Register server"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
+-msgstr "Register this game at the meta server"
++msgid "Register this game at the metaserver"
++msgstr "Register this game at the metaserver"
+ 
+ #. hostname label
+ #: ../server/gtk/main.c:595
+@@ -3514,13 +3512,13 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
+-msgstr "Register server with meta-server"
++msgid "Register server with metaserver"
++msgstr "Register server with metaserver"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
+-msgstr "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
++msgstr "Register at metaserver name (implies -r)"
+ 
+ #. Commandline server-console: hostname
+ #: ../server/main.c:114
+@@ -3559,13 +3557,13 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
+-msgstr "Meta-server Options"
++msgid "Metaserver Options"
++msgstr "Metaserver Options"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
+-msgstr "Options for the meta-server"
++msgid "Options for the metaserver"
++msgstr "Options for the metaserver"
+ 
+ #. Commandline server-console: Short description of misc group
+ #: ../server/main.c:193
+@@ -3592,8 +3590,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Admin port not available.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "The network port (%s) for the admin interface is not available.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3603,12 +3601,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Register with meta-server at %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Register with metaserver at %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Unregister from meta-server\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Unregister from the metaserver.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/es.po --label pioneers-14.1/po/es.po 	     .pc/svn1860-2091_po.diff/po/es.po po/es.po
+Index: pioneers-14.1/po/es.po
+===================================================================
+--- pioneers-14.1.orig/po/es.po
++++ pioneers-14.1/po/es.po
+@@ -9,17 +9,17 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.5\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2012-07-08 03:34+0000\n"
+ "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+ "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
++"Language: es\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-Launchpad-Export-Date: 2012-09-06 06:01+0000\n"
+ "X-Generator: Launchpad (build 15909)\n"
+-"Language: es\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -973,7 +973,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Meta-servidor en %s, puerto %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -982,16 +982,16 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
+ msgstr "Meta-servidor nos sacÃ³\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Recibiendo nombres del juego de Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
+ msgstr "Nuevo servidor de juego solicitado en %s puerto %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+@@ -1000,8 +1000,8 @@
+ msgstr "Mensaje desconocido del Meta-servidor: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Demasiados desvÃos del meta-servidor\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Demasiados desvÃos del meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1010,7 +1010,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Meta-servidor muy viejo para crear servidores(versiÃ³n %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1041,11 +1041,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Desviado al Meta-servidor en %s, puerto %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Desviado al Meta-servidor en %s, puerto %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Recibiendo una lista de servidores Pioneers del Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1069,8 +1069,8 @@
+ msgstr "El NÃºmero de jugadores de la computador"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Pidiendo nuevo servidor de juego\n"
++msgid "Requesting new game server.\n"
++msgstr "Pidiendo nuevo servidor de juego.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1099,7 +1099,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Crear un nuevo juego publicoen el Meta-servidor"
+ 
+ #. Tooltip
+@@ -1252,7 +1252,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta-servidor"
+ 
+ #. Button
+@@ -1941,7 +1941,7 @@
+ msgstr "Conectarse como un espectador"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Meta-servidor del anfitrion"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2577,7 +2577,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr ""
+ 
+@@ -2644,7 +2644,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Seleccionar un meta-servidor"
+ 
+ #. Tooltip for the list of games
+@@ -3114,7 +3114,7 @@
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1324
+ msgid "_Change Title"
+-msgstr "_Cambiar tÃtulo"
++msgstr "_Cambiar titulo"
+ 
+ #. Tooltip for Change Title menu entry
+ #: ../editor/gtk/editor.c:1326
+@@ -3189,7 +3189,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "Daemonizar el metaservidor al iniciar"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3199,7 +3199,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Redirigir clientes a otro metaservidor"
+ 
+ #. Commandline meta-server: server
+@@ -3229,12 +3229,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Meta Servidor para Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "protocolo del metaservidor:"
+ 
+ #: ../server/avahi.c:68
+@@ -3319,7 +3319,7 @@
+ msgstr "Hacer incribirse el servidor"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registrar este juego en el Meta-servidor"
+ 
+ #. hostname label
+@@ -3530,12 +3530,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Hacer incribirse el servidor con el Meta-servidor"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registro en nombre de Meta-servidor (supone -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3577,12 +3577,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Opciones de Meta-servidor"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Opciones para el Meta-servidor"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3612,8 +3612,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "El Puerto de administraciÃ³n no es disponible.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "El Puerto de administraciÃ³n (%s) no es disponible.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3625,12 +3625,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registro con Meta-servidor en %s, puerto %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registro con Meta-servidor en %s, puerto %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Registro del Meta-servidor\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Registro del Meta-servidor.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/fr.po --label pioneers-14.1/po/fr.po 	     .pc/svn1860-2091_po.diff/po/fr.po po/fr.po
+Index: pioneers-14.1/po/fr.po
+===================================================================
+--- pioneers-14.1.orig/po/fr.po
++++ pioneers-14.1/po/fr.po
+@@ -7,10 +7,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2012-05-22 14:36+0100\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-15 20:05+0100\n"
+ "Last-Translator: Jean-Charles GRANGER <traduction@vecteur.org>\n"
+ "Language-Team: FranÃ§ais <LL@li.org>, LT-P <LT-P@LT-P.net>, Yusei "
+ "<yusei@ragondux.com>, Arnaud MALON <moko@geumeuleu.com>, Jean-Charles "
+@@ -19,10 +19,9 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Poedit-Country: FRANCE\n"
+ "X-Poedit-SourceCharset: utf-8\n"
+-"X-Poedit-Language: French\n"
+-"Plural-Forms: nplurals=2; plural=(n>1)\n"
++"Plural-Forms: nplurals=2; plural=(n>1);\n"
++"X-Generator: Poedit 1.5.7\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -346,7 +345,7 @@
+ "Ce plateau n'est pas une partie oÃ¹ l'on peut jouer : c'est un lieu oÃ¹ l'on "
+ "peut rencontrer d'autres joueurs et dÃ©cider quel plateau jouer. L'un des "
+ "joueurs hÃ©bergera la partie choisie en dÃ©marrant un serveur et en "
+-"l'enregistrant sur le metaserveur. Les autres joueurs pourront ensuite se "
++"l'enregistrant sur le meta-serveur. Les autres joueurs pourront ensuite se "
+ "dÃ©connecter du Hall d'Accueil, et entrer dans la partie."
+ 
+ #: ../client/ai/lobbybot.c:130
+@@ -978,7 +977,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Meta-serveur Ã  l'adresse %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -987,17 +986,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Le meta-serveur nous a expulsÃ©\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Le meta-serveur a terminÃ© la connexion de maniÃ¨re inattendue.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Reception du nom des parties du meta-serveur.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Une nouvelle partie commence sur le serveur %s, port %s.\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "RequÃªte vers le nouveau serveur %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -1005,8 +1004,8 @@
+ msgstr "Message inconnu du meta-serveur : %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Trop de redirections du meta-serveur\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Trop de redirections du meta-serveur.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1015,7 +1014,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr ""
+ "Le meta-serveur est trop vieux pour crÃ©er des parties (version %d.%d)\n"
+ 
+@@ -1047,11 +1046,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Redirection sur le meta-serveur %s, port %s.\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Redirection vers le meta-serveur %s, port %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "RÃ©ception d'une liste de serveurs Pioneers depuis le meta-serveur.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1075,8 +1074,8 @@
+ msgstr "Nombre de joueurs AI"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Demander une nouvelle partie\n"
++msgid "Requesting new game server.\n"
++msgstr "RequÃªte en cours pour un nouveau serveur.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1105,7 +1104,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "CrÃ©er une nouvelle partie publique sur le meta-serveur"
+ 
+ #. Tooltip
+@@ -1258,7 +1257,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta-serveur"
+ 
+ #. Button
+@@ -1947,7 +1946,7 @@
+ msgstr "Se connecter en tant que spectateur"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "HÃ´te du meta-serveur"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2465,7 +2464,7 @@
+ "Total: %d"
+ msgstr ""
+ "Points de victoire requis : %d\n"
+-"Points obtenus en tout construisant : %d\n"
++"Points obtenus en construisant tout : %d\n"
+ "Points dans les cartes de dÃ©veloppement : %d\n"
+ "Route la plus longue / chevalier le plus puissant : %d+%d\n"
+ "Bonus maximum pour la dÃ©couverte d'iles : %d\n"
+@@ -2491,6 +2490,7 @@
+ msgid "Authors:"
+ msgstr "Auteurs :"
+ 
++#
+ #. Translators: add your name here. Keep the list alphabetically,
+ #. * do not remove any names, and add \n after your name (except the last name).
+ #.
+@@ -2583,7 +2583,7 @@
+ "Ã®les"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "VÃ©rifiez et corrigez les bonus pour la dÃ©couverte d'une Ã®le"
+ 
+@@ -2650,7 +2650,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Choisir un meta-serveur"
+ 
+ #. Tooltip for the list of games
+@@ -3196,7 +3196,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "DÃ©moniser le meta-serveur au dÃ©marrage"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3206,7 +3206,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Rediriger les clients vers un autre meta-serveur"
+ 
+ #. Commandline meta-server: server
+@@ -3236,12 +3236,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Meta-serveur pour Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "protocole du meta-serveur :"
+ 
+ #: ../server/avahi.c:68
+@@ -3325,7 +3325,7 @@
+ msgstr "Annoncer le serveur"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Annoncer cette partie sur le meta-serveur"
+ 
+ #. hostname label
+@@ -3535,12 +3535,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Annoncer cette partie sur le meta-serveur"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Nom du meta-serveur d'enregistrement (implique -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3583,12 +3583,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Options du meta-serveur"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Options du meta-serveur"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3617,8 +3617,9 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Port d'administration non disponible.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr ""
++"Le port rÃ©seau (%s) pour l'interface d'administration n'est pas disponible.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3630,12 +3631,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "AnnoncÃ© sur le meta-serveur : %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "AnnoncÃ© sur le meta-serveur : %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Se dÃ©sinscrire du meta-serveur\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Se dÃ©sinscrire du meta-serveur.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/gl.po --label pioneers-14.1/po/gl.po 	     .pc/svn1860-2091_po.diff/po/gl.po po/gl.po
+Index: pioneers-14.1/po/gl.po
+===================================================================
+--- pioneers-14.1.orig/po/gl.po
++++ pioneers-14.1/po/gl.po
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2010-04-05 08:14+0000\n"
+ "Last-Translator: Indalecio FreirÃa Santos <ifreiria@gmail.com>\n"
+ "Language-Team: Galician <gl@li.org>\n"
+@@ -971,7 +971,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Metaservidor en %s, porto %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -980,16 +980,16 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Botounos o Meta-servidor\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Botounos o Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Recibindo nomes do xogo dende o metaservidor.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
+ msgstr "Novo servidor solicitado en %s porto %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+@@ -998,8 +998,8 @@
+ msgstr "Mensaxe descoÃ±ecida do metaservidor: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Demasiada redirecciÃ³ns do metaservidor\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Demasiada redirecciÃ³ns do metaservidor.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1008,7 +1008,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Metaservidor moi vello para crear servidores(versiÃ³n %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1039,11 +1039,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Desviado ao metaservidor en %s, porto %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Desviado ao metaservidor en %s, porto %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Recibindo unha lista de servidores Pioneiros do meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1069,8 +1069,8 @@
+ msgstr "NÃºmero de xogadores"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Pidindo un novo servidor de xogo\n"
++msgid "Requesting new game server.\n"
++msgstr "Pidindo un novo servidor de xogo.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, fuzzy, c-format
+@@ -1100,7 +1100,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Crear un xogo pÃºblico novo no metaservidor"
+ 
+ #. Tooltip
+@@ -1255,7 +1255,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaservidor"
+ 
+ #. Button
+@@ -1946,7 +1946,7 @@
+ msgstr "Conectar como visor"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Meta-servidor do anfitrion"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2482,6 +2482,7 @@
+ msgid "Authors:"
+ msgstr "Autores:"
+ 
++#
+ #. Translators: add your name here. Keep the list alphabetically,
+ #. * do not remove any names, and add \n after your name (except the last name).
+ #.
+@@ -2568,7 +2569,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ #, fuzzy
+ msgid "Check and correct island discovery bonuses"
+ msgstr "BonificaciÃ³ns por descubrimento de illas:"
+@@ -2636,7 +2637,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Seleccionar un meta-servidor"
+ 
+ #. Tooltip for the list of games
+@@ -3184,7 +3185,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "Converter en daemon o meta servidor ao iniciar"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3194,7 +3195,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Redirixir clientes a outro meta-servidor"
+ 
+ #. Commandline meta-server: server
+@@ -3224,12 +3225,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Meta Servidor para Pioneiros"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "protocolo do meta-servidor:"
+ 
+ #: ../server/avahi.c:68
+@@ -3313,7 +3314,7 @@
+ msgstr "Rexistrar o servidor"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Rexistrar este xogo no meta-servidor"
+ 
+ #. hostname label
+@@ -3462,6 +3463,7 @@
+ msgid "The Pioneers Game Server"
+ msgstr "O servidor do xogo Pioneiros"
+ 
++#
+ #. Wait for all players to disconnect,
+ #. * then enable the UI
+ #.
+@@ -3526,12 +3528,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Rexistrar o servidor co meta-servidor"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Rexistrar en nome do meta-servidor (supÃ³n -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3572,12 +3574,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "OpciÃ³n do metaservidor"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "OpciÃ³n para o metaservidor"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3606,9 +3608,9 @@
+ 
+ #. Error message
+ #: ../server/main.c:275
+-#, fuzzy, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Sintoo, %s dispoÃ±Ãbel.\n"
++#, c-format
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr ""
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3620,12 +3622,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Rexistrar co metaservidor no %s, porto %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Rexistrar co metaservidor no %s, porto %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Darse de baixa do metaservidor\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Darse de baixa do metaservidor.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/hu.po --label pioneers-14.1/po/hu.po 	     .pc/svn1860-2091_po.diff/po/hu.po po/hu.po
+Index: pioneers-14.1/po/hu.po
+===================================================================
+--- pioneers-14.1.orig/po/hu.po
++++ pioneers-14.1/po/hu.po
+@@ -9,7 +9,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.2\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2008-04-05 15:37+0200\n"
+ "Last-Translator: Ferenc BÃ¡nhidi <bferike@mailbox.hu>\n"
+ "Language-Team: Hungarian <bferike@mailbox.hu>\n"
+@@ -976,7 +976,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Meta szerver: %s, port: %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -985,17 +985,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "A meta szerver kirÃºgott minket\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "A meta szerver kirÃºgott minket.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "JÃ¡tÃ©kok vÃ©tele a meta szerverrÅ?l.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Szerver kÃ©rÃ©s Ãºj jÃ¡tÃ©kra: %s, port: %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Szerver kÃ©rÃ©s Ãºj jÃ¡tÃ©kra: %s, port: %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -1003,8 +1003,8 @@
+ msgstr "Ismeretlen Ã¼zenet a metaszervertÅ?l: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "TÃºl sok meta szerver Ã¡tirÃ¡nyÃtÃ¡s\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "TÃºl sok meta szerver Ã¡tirÃ¡nyÃtÃ¡s.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1013,7 +1013,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Meta szerver tÃºl rÃ©gi a szerver lÃ©trehozÃ¡shoz (verziÃ³ %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1044,11 +1044,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Ã?tirÃ¡nyÃtva %s meta szerverhez, %s portra\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Ã?tirÃ¡nyÃtva %s meta szerverhez, %s portra.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Pioneers szerver lista fogadÃ¡sa a meta szervertÅ?l.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1074,7 +1074,7 @@
+ msgstr "A jÃ¡tÃ©kosok szÃ¡ma"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
++msgid "Requesting new game server.\n"
+ msgstr "Ã?j jÃ¡tÃ©kszerver kÃ©rÃ©s\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+@@ -1104,7 +1104,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Ã?j publikus jÃ¡tÃ©k lÃ©trehozÃ¡sa meta szerverre"
+ 
+ #. Tooltip
+@@ -1259,7 +1259,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta szerver"
+ 
+ #. Button
+@@ -1339,10 +1339,11 @@
+ msgstr "Nyersanyagok eldobÃ¡sa"
+ 
+ #: ../client/gtk/discard.c:101
+-#, fuzzy, c-format
++#, c-format
+ msgid "You must discard %d resource"
+ msgid_plural "You must discard %d resources"
+-msgstr[0] "El kell dobnod %d db nyersanyagot"
++msgstr[0] ""
++msgstr[1] "El kell dobnod %d db nyersanyagot"
+ 
+ #. Label
+ #: ../client/gtk/discard.c:110
+@@ -1375,10 +1376,11 @@
+ msgstr "VÃ¡lassz nyersanyagokat"
+ 
+ #: ../client/gtk/gold.c:96
+-#, fuzzy, c-format
++#, c-format
+ msgid "You may choose %d resource"
+ msgid_plural "You may choose %d resources"
+-msgstr[0] "VÃ¡laszthatsz %d db nyersanyagot"
++msgstr[0] ""
++msgstr[1] "VÃ¡laszthatsz %d db nyersanyagot"
+ 
+ #. Text for total in choose gold dialog
+ #. Text for total in year of plenty dialog
+@@ -1949,7 +1951,7 @@
+ msgstr "CsatlakozÃ¡s szemlÃ©lÅ?kÃ©nt"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Meta-szerver host"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2569,7 +2571,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ #, fuzzy
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Sziget felfedezÃ©s bÃ³nuszok:"
+@@ -2637,7 +2639,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "VÃ¡lassz egy meta szervert"
+ 
+ #. Tooltip for the list of games
+@@ -3187,7 +3189,7 @@
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+ #, fuzzy
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "A metaszerver dÃ©monkÃ©nt induljon"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3198,7 +3200,7 @@
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+ #, fuzzy
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "IrÃ¡nyÃtsd a klienseket egy mÃ¡sik metaszeverhez"
+ 
+ #. Commandline meta-server: server
+@@ -3228,12 +3230,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Meta szerver a Pioneers jÃ¡tÃ©khoz"
+ 
+ #: ../meta-server/main.c:1135
+ #, fuzzy, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "metaszerver protokoll:"
+ 
+ #: ../server/avahi.c:68
+@@ -3316,7 +3318,7 @@
+ msgstr "Szerver regisztrÃ¡lÃ¡s"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "JÃ¡tÃ©k regisztrÃ¡lÃ¡sa a meta szerverre"
+ 
+ #. hostname label
+@@ -3528,12 +3530,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Szerver regisztrÃ¡lÃ¡sa a meta szerverre"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "RegisztrÃ¡lj a meta-szerver nÃ©vre (beleÃ©rtve -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3573,12 +3575,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Meta szerver kapcsolÃ³k"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "meta-szerver kapcsolÃ³k"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3605,8 +3607,8 @@
+ 
+ #. Error message
+ #: ../server/main.c:275
+-#, fuzzy, c-format
+-msgid "Admin port not available.\n"
++#, c-format
++msgid "The network port (%s) for the admin interface is not available.\n"
+ msgstr "Bocs, %s hasznÃ¡lhatÃ³.\n"
+ 
+ #. server-console commandline error
+@@ -3616,13 +3618,13 @@
+ msgstr "Admin port nincs beÃ¡llÃtva, Ãgy a jÃ¡tÃ©k kezdÃ©s nem lehet tiltva\n"
+ 
+ #: ../server/meta.c:187
+-#, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "RegisztrÃ¡lÃ¡s a meta szerverrel %s, port %s\n"
++#, fuzzy, c-format
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "RegisztrÃ¡lÃ¡s a meta szerverrel %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Ismeretlen Ã¼zenet a metaszervertÅ?l\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Ismeretlen Ã¼zenet a metaszervertÅ?l.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/it.po --label pioneers-14.1/po/it.po 	     .pc/svn1860-2091_po.diff/po/it.po po/it.po
+Index: pioneers-14.1/po/it.po
+===================================================================
+--- pioneers-14.1.orig/po/it.po
++++ pioneers-14.1/po/it.po
+@@ -2,14 +2,14 @@
+ # Copyright (C) 1999-2001 Dave Cole
+ # Copyright (C) 2000-2002 Andy Heroff
+ # This file is distributed under the same license as the pioneers package.
+-# Giancarlo Capella <giancarlo@comm.cc>, 2005-2012.
++# Giancarlo Capella <giancarlo@comm.cc>, 2005-2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2012-05-21 14:12:00+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-11 20:12:00+0200\n"
+ "Last-Translator: Giancarlo Capella <giancarlo@comm.cc>\n"
+ "Language-Team: it <it@li.org>\n"
+ "Language: it\n"
+@@ -970,8 +970,8 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
+-msgstr "Meta-server su %s, porta %s"
++msgid "Metaserver at %s, port %s"
++msgstr "Metaserver su %s, porta %s"
+ 
+ #: ../client/gtk/connect.c:287
+ msgid "Finished.\n"
+@@ -979,17 +979,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Il meta-server ci ha buttati fuori\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Il metaserver ha chiuso la connessione inaspettatamente.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
+-msgstr "Ricezione dei nomi partita dal meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
++msgstr "Ricezione dei nomi partita dal metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Nuovo server di partita richiesto su %s porta %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Nuovo server di partita richiesto su %s porta %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -997,8 +997,8 @@
+ msgstr "Messaggio sconosciuto dal metaserver: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Troppe ridirezioni del metaserver\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Troppe ridirezioni del metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1007,8 +1007,8 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
+-msgstr "Meta server troppo vecchio per creare server (versione %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
++msgstr "Metaserver troppo vecchio per creare server (versione %d.%d)\n"
+ 
+ #. Sevens rule: normal
+ #: ../client/gtk/connect.c:594 ../client/gtk/settingscreen.c:181
+@@ -1038,12 +1038,12 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Rediretto sul meta-server %s, porta %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Rediretto sul metaserver %s, porta %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
+-msgstr "Ricezione della lista dei server Pioneers dal meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
++msgstr "Ricezione della lista dei server Pioneers dal metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:708
+ msgid ""
+@@ -1066,8 +1066,8 @@
+ msgstr "Il numero di giocatori AI"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Richiesta nuovo server di partita\n"
++msgid "Requesting new game server.\n"
++msgstr "Richiesta nuovo server di partita.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1096,8 +1096,8 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
+-msgstr "Registra questa partita sul meta server"
++msgid "Create a new public game at the metaserver"
++msgstr "Registra questa partita sul metaserver"
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:984
+@@ -1249,7 +1249,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaserver"
+ 
+ #. Button
+@@ -1938,7 +1938,7 @@
+ msgstr "Connetti come spettatore"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Metaserver Host"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2564,7 +2564,7 @@
+ msgstr "Lista di punti bonus per la scoperta isole, separati da virgola"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Controlla e corregge i bonus per la scoperta isole"
+ 
+@@ -2631,8 +2631,8 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
+-msgstr "Seleziona un meta server"
++msgid "Select a metaserver"
++msgstr "Seleziona un metaserver"
+ 
+ #. Tooltip for the list of games
+ #: ../common/gtk/select-game.c:104
+@@ -3178,8 +3178,8 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
+-msgstr "Demonizza il meta-server all'avvio"
++msgid "Daemonize the metaserver on start"
++msgstr "Demonizza il metaserver all'avvio"
+ 
+ #. Commandline meta-server: pidfile
+ #: ../meta-server/main.c:1072
+@@ -3188,8 +3188,8 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
+-msgstr "Redirigi i client ad un altro meta-server"
++msgid "Redirect clients to another metaserver"
++msgstr "Redirigi i client ad un altro metaserver"
+ 
+ #. Commandline meta-server: server
+ #: ../meta-server/main.c:1080
+@@ -3218,13 +3218,13 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
+-msgstr "- Meta server per Pioneers"
++msgid "- Metaserver for Pioneers"
++msgstr "- Metaserver per Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
+-msgstr "protocollo meta-server:"
++msgid "metaserver protocol:"
++msgstr "protocollo metaserver:"
+ 
+ #: ../server/avahi.c:68
+ msgid "Avahi registration successful.\n"
+@@ -3306,8 +3306,8 @@
+ msgstr "Registra server"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
+-msgstr "Registra questa partita sul meta server"
++msgid "Register this game at the metaserver"
++msgstr "Registra questa partita sul metaserver"
+ 
+ #. hostname label
+ #: ../server/gtk/main.c:595
+@@ -3517,12 +3517,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
+-msgstr "Registra il server sul meta server"
++msgid "Register server with metaserver"
++msgstr "Registra il server sul metaserver"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registra sul metaserver con nome (implica -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3565,13 +3565,13 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
+-msgstr "Opzioni meta-server"
++msgid "Metaserver Options"
++msgstr "Opzioni metaserver"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
+-msgstr "Opzioni per il meta-server"
++msgid "Options for the metaserver"
++msgstr "Opzioni per il metaserver"
+ 
+ #. Commandline server-console: Short description of misc group
+ #: ../server/main.c:193
+@@ -3599,8 +3599,9 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Porta di amministrazione non disponibile.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr ""
++"La porta di rete (%s) per l'interfaccia amministratore non Ã¨ disponibile.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3612,12 +3613,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registra sul meta-server %s, porta %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registra sul metaserver %s, porta %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Deregistra dal metaserver\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Deregistra dal metaserver.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/ja.po --label pioneers-14.1/po/ja.po 	     .pc/svn1860-2091_po.diff/po/ja.po po/ja.po
+Index: pioneers-14.1/po/ja.po
+===================================================================
+--- pioneers-14.1.orig/po/ja.po
++++ pioneers-14.1/po/ja.po
+@@ -7,19 +7,19 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2012-09-05 02:27+0000\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-16 02:46+0000\n"
+ "Last-Translator: KAMO Tomoyuki <kto@miomio.jp>\n"
+ "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
++"Language: ja\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=1; plural=0;\n"
+-"X-Launchpad-Export-Date: 2012-09-06 06:00+0000\n"
+-"X-Generator: Launchpad (build 15909)\n"
+-"Language: ja\n"
++"X-Launchpad-Export-Date: 2013-09-18 06:12+0000\n"
++"X-Generator: Launchpad (build 16765)\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -34,7 +34,7 @@
+ #. Commandline pioneersai: name
+ #: ../client/ai/ai.c:76
+ msgid "Computer name (mandatory)"
+-msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿å?? (å¿?é ?)"
++msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼ã?®å??å?? (å¿?é ?)"
+ 
+ #. Commandline pioneersai: time
+ #: ../client/ai/ai.c:79
+@@ -44,7 +44,7 @@
+ #. Commandline pioneersai: chat-free
+ #: ../client/ai/ai.c:82
+ msgid "Stop computer player from talking"
+-msgstr "ä¼?è©±ã??ã??ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼ã??å??æ¢"
++msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼ã?«ã??ã?£ã??ã??ã?§ã??ã??ã?¹ã??ã??ã?ªã??"
+ 
+ #. Commandline pioneersai: algorithm
+ #: ../client/ai/ai.c:85
+@@ -70,7 +70,7 @@
+ #: ../client/ai/ai.c:91 ../client/gtk/offline.c:71 ../editor/gtk/editor.c:1419
+ #: ../meta-server/main.c:1096 ../server/gtk/main.c:1133 ../server/main.c:100
+ msgid "Show version information"
+-msgstr "ã??ã?¼ã?¸ã?§ã?³æ??å ±ã??è¡¨ç¤º"
++msgstr "ã??ã?¼ã?¸ã?§ã?³æ??å ±ã??è¡¨ç¤ºã??ã??"
+ 
+ #. Long description in the commandline for pioneersai: help
+ #: ../client/ai/ai.c:102
+@@ -309,7 +309,9 @@
+ msgid ""
+ "Hello, welcome to the lobby. I am a simple robot. Type '/help' in the chat "
+ "to see the list of commands I know."
+-msgstr "ã??ã??ã?«ã?¡ã?¯ã??ã??ã??ã??ã??ã?ã??ã?¼ã?¸ã??ç§?ã?¯å??ç´?ã?ªã?ã??ã??ã??ã?§ã??ã??ã??ã?£ã??ã??ã?§'/help'ã?¨æ??ã?¡è¾¼ã??ã?¨ã??ç§?ã??ç?¥ã?£ã?¦ã??ã??ã?³ã??ã?³ã??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã?¾ã??ã??"
++msgstr ""
++"ã??ã??ã?«ã?¡ã?¯ã??ã??ã??ã??ã??ã?ã??ã?¼ã?¸ã??ç§?ã?¯å??ç´?ã?ªã?ã??ã??ã??ã?§ã??ã??ã??ã?£ã??ã??ã?§'/help'ã?¨æ??ã?¡"
++"è¾¼ã??ã?¨ã??ç§?ã??ç?¥ã?£ã?¦ã??ã??ã?³ã??ã?³ã??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã?¾ã??ã??"
+ 
+ #. Translators: don't translate '/help'
+ #: ../client/ai/lobbybot.c:107
+@@ -335,8 +337,11 @@
+ "registers it at the metaserver. The other players can subsequently "
+ "disconnect from the lobby, and enter that game."
+ msgstr ""
+-"ã??ã?®ã??ã?¼ã??ã?¯ã?²ã?¼ã? ã??é??ã?¶ã??ã??ã?®ã??ã?®ã?§ã?¯ã??ã??ã?¾ã??ã??ã??ã??ã?®ä»£ã??ã??ã?«ã??ã??ã?¬ã?¤ã?¤ã?¼ã?¯ã??ã??ã?§ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼ã??è¦?ã?¤ã??ã??ã?©ã?®ã??ã?¼ã??ã?§é??ã?³ã??ã??ã??ã??æ±ºã??ã?¾ã??ã??ã??ã??ã?¦ã??ã??ã?¬ã?¤"
+-"ã?¤ã?¼ã?®ä¸?äººã??ã?µã?¼ã??ã??é??å§?ã??ã?¦æ??æ¡?ã??ã??ã??ã?²ã?¼ã? ã?®ã??ã?¹ã??ã?¨ã?ªã??ã??ã?²ã?¼ã? ã??ã?¡ã?¿ã?µã?¼ã??ã?«ç?»é?²ã??ã?¾ã??ã??ç¶?ã??ã?¦ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼ã?¯ã?ã??ã?¼ã??ã??å??æ?ã??ã??ã?²ã?¼ã? ã?«å??å? ã??ã?¾ã??ã??"
++"ã??ã?®ã??ã?¼ã??ã?¯ã?²ã?¼ã? ã??é??ã?¶ã??ã??ã?®ã??ã?®ã?§ã?¯ã??ã??ã?¾ã??ã??ã??ã??ã?®ä»£ã??ã??ã?«ã??ã??ã?¬ã?¤ã?¤ã?¼ã?¯"
++"ã??ã??ã?§ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼ã??è¦?ã?¤ã??ã??ã?©ã?®ã??ã?¼ã??ã?§é??ã?³ã??ã??ã??ã??æ±ºã??ã?¾ã??ã??ã??ã??ã?¦ã??ã??ã?¬"
++"ã?¤ã?¤ã?¼ã?®ä¸?äººã??ã?µã?¼ã??ã??é??å§?ã??ã?¦æ??æ¡?ã??ã??ã??ã?²ã?¼ã? ã?®ã??ã?¹ã??ã?¨ã?ªã??ã??ã?²ã?¼ã? ã??ã?¡ã?¿"
++"ã?µã?¼ã??ã?«ç?»é?²ã??ã?¾ã??ã??ç¶?ã??ã?¦ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼ã?¯ã?ã??ã?¼ã??ã??å??æ?ã??ã??ã?²ã?¼ã? ã?«å??å? ã??ã?¾"
++"ã??ã??"
+ 
+ #: ../client/ai/lobbybot.c:130
+ msgid "The last released version of Pioneers is"
+@@ -353,7 +358,7 @@
+ 
+ #: ../client/common/client.c:108
+ msgid "Idle"
+-msgstr "å¾?æ©?"
++msgstr "ã?¢ã?¤ã??ã?«"
+ 
+ #: ../client/common/client.c:533
+ msgid "We have been kicked out of the game.\n"
+@@ -409,7 +414,7 @@
+ #: ../client/common/client.c:765
+ #, c-format
+ msgid "%s discarded %s.\n"
+-msgstr "%s ã?¯ %s ã??å¤±ã?£ã??ã??\n"
++msgstr "%s ã?¯ %s ã??æ?¨ã?¦ã??ã??\n"
+ 
+ #: ../client/common/client.c:839
+ #, c-format
+@@ -421,13 +426,11 @@
+ msgstr "ã?ã?¼ã??ä¸"
+ 
+ #: ../client/common/client.c:983
+-#| msgid "Version mismatch"
+ msgid "Version mismatch."
+ msgstr "ã??ã?¼ã?¸ã?§ã?³ä¸?æ?´å??ã??"
+ 
+ #: ../client/common/client.c:985
+-msgid ""
+-"Version mismatch. Please make sure client and server are up to date.\n"
++msgid "Version mismatch. Please make sure client and server are up to date.\n"
+ msgstr "ã??ã?¼ã?¸ã?§ã?³ä¸?æ?´å??ã??ã?¯ã?©ã?¤ã?¢ã?³ã??ã?¨ã?µã?¼ã??ã??æ??æ?°ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??\n"
+ 
+ #: ../client/common/client.c:1410
+@@ -455,7 +458,6 @@
+ msgstr " ã?¾ã??ã?¯"
+ 
+ #: ../client/common/client.c:1491
+-#| msgid "Waiting for your turn"
+ msgid "Waiting for your turn."
+ msgstr "ã??ã?ªã??ã?®ã?¿ã?¼ã?³ã??å¾?ã?£ã?¦ã??ã??ã??"
+ 
+@@ -468,7 +470,6 @@
+ msgstr "å¼·å¥ªã??ã??è?¹ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??"
+ 
+ #: ../client/common/client.c:1649 ../client/gtk/interface.c:790
+-#| msgid "Place the robber"
+ msgid "Place the robber."
+ msgstr "ç??è³?ã??é??ç½®ã??ã?¦ã??ã? ã??ã??ã??"
+ 
+@@ -493,7 +494,7 @@
+ #: ../client/common/client.c:2164
+ #, c-format
+ msgid "Sorry, %s available.\n"
+-msgstr "ã??ã?¿ã?¾ã??ã??ã??%s ä½¿ç?¨å?¯è?½ã??\n"
++msgstr "ã??ã?¿ã?¾ã??ã??ã??%s å?©ç?¨å?¯è?½ã??\n"
+ 
+ #: ../client/common/client.c:2478
+ msgid "The game is over."
+@@ -586,7 +587,6 @@
+ 
+ #: ../client/common/player.c:267
+ #, c-format
+-#| msgid "%s has quit\n"
+ msgid "%s has quit.\n"
+ msgstr "%s ã?¯çµ?äº?ã??ã??ã??\n"
+ 
+@@ -601,7 +601,7 @@
+ 
+ #: ../client/common/player.c:300
+ msgid "There is no longest road.\n"
+-msgstr "æ??é?·äº¤æ??è·¯ã?ªã??ã??\n"
++msgstr "æ??é?·äº¤æ??è·¯ã?¯ã?ªã??ã?ªã?£ã??ã??\n"
+ 
+ #: ../client/common/player.c:303
+ #, c-format
+@@ -661,7 +661,7 @@
+ #: ../client/common/player.c:492
+ #, c-format
+ msgid "%s built a ship.\n"
+-msgstr "%s ã?¯è?¹ã??é? è?¹ã??ã??ã??\n"
++msgstr "%s ã?¯è?¹ã??è£½é? ã??ã??ã??\n"
+ 
+ #: ../client/common/player.c:505
+ #, c-format
+@@ -971,7 +971,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "ã?¡ã?¿ã?µã?¼ã?? %sã??ã??ã?¼ã?? %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -980,17 +980,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "ã?¡ã?¿ã?µã?¼ã??ã??æ??ã??ã??è¹´ã??å?ºã??ã??ã??\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "ã?¡ã?¿ã?µã?¼ã??ã?¯äº?æ??ã??ã??æ?¥ç¶?ã??é??ã??ã??ã??\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã??ã?²ã?¼ã? å??ã??å??ä¿¡ä¸ã??\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "æ?°ã??ã??ã?²ã?¼ã? ã?µã?¼ã??ã?? %s ã?®ã??ã?¼ã?? %s ã?§è¦?æ±?ã??ã??ã?¦ã??ã??\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "æ?°ã??ã??ã?²ã?¼ã? ã?µã?¼ã??ã?? %s ã?®ã??ã?¼ã?? %s ã?§è¦?æ±?ã??ã??ã?¦ã??ã??ã??\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -998,8 +998,8 @@
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã??ã?®ä¸?æ??ã?ªã?¡ã??ã?»ã?¼ã?¸: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "ã?¡ã?¿ã?µã?¼ã??ã?®ã?ªã??ã?¤ã?¬ã?¯ã??ã??å¤?ã??ã??ã??\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "ã?¡ã?¿ã?µã?¼ã??ã?®ã?ªã??ã?¤ã?¬ã?¯ã??ã??å¤?ã??ã??ã??ã??\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1008,7 +1008,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??å?¤ã??ã??ã?¦ã?µã?¼ã??ã??ä½?ã??ã??ã?¨ã??ã?§ã??ã?ªã?? (ã??ã?¼ã?¸ã?§ã?³ %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1039,11 +1039,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "%s ã?®ã??ã?¼ã?? %s ã?®ã?¡ã?¿ã?µã?¼ã??ã?«ã?ªã??ã?¤ã?¬ã?¯ã??\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "%s ã?®ã??ã?¼ã?? %s ã?®ã?¡ã?¿ã?µã?¼ã??ã?«ã?ªã??ã?¤ã?¬ã?¯ã??ã??\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã?? Pioneers ã?µã?¼ã??ã?®ä¸?è¦§ã??å??å¾?ä¸ã??\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1067,8 +1067,8 @@
+ msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼ã?®æ?°"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "æ?°ã??ã??ã?²ã?¼ã? ã?µã?¼ã??ã??è¦?æ±?ä¸\n"
++msgid "Requesting new game server.\n"
++msgstr "æ?°ã??ã??ã?²ã?¼ã? ã?µã?¼ã??ã??è¦?æ±?ä¸ã??\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1077,19 +1077,16 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/connect.c:832
+-#| msgid "Create a public game"
+ msgid "Create a Public Game"
+ msgstr "å?¬é??ã?²ã?¼ã? ä½?æ??"
+ 
+ #. Dialog caption
+ #: ../client/gtk/connect.c:955
+-#| msgid "Join a public game"
+ msgid "Join a Public Game"
+ msgstr "å?¬é??ã?²ã?¼ã? ã?«å??å? "
+ 
+ #. Button text
+ #: ../client/gtk/connect.c:961
+-#| msgid "_New remote game"
+ msgid "_New Remote Game"
+ msgstr "æ?°è¦?ã?ªã?¢ã?¼ã??ã?²ã?¼ã? (_N)"
+ 
+@@ -1100,7 +1097,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã?«æ?°ã??ã??å?¬é??ã?²ã?¼ã? ã??ä½?æ??ã??ã??"
+ 
+ #. Tooltip
+@@ -1211,9 +1208,8 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/connect.c:1224
+-#| msgid "Start a new game"
+ msgid "Start a New Game"
+-msgstr "æ?°ã?²ã?¼ã? é??å§?"
++msgstr "æ?°ã??ã??ã?²ã?¼ã? ã??é??å§?"
+ 
+ #. Label
+ #. Commandline option of client: name of the player
+@@ -1254,13 +1250,11 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-#| msgid "Meta Server"
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??"
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1351
+-#| msgid "Join public game"
+ msgid "Join Public Game"
+ msgstr "å?¬é??ã?²ã?¼ã? ã?«å??å? "
+ 
+@@ -1271,18 +1265,16 @@
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1362
+-#| msgid "Create game"
+ msgid "Create Game"
+-msgstr "å?¬é??ã?²ã?¼ã? ä½?æ??"
++msgstr "ã?²ã?¼ã? ä½?æ??"
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:1366
+ msgid "Create a game"
+-msgstr "å?¬é??ã?²ã?¼ã? ã??ä½?æ??ã??ã??"
++msgstr "ã?²ã?¼ã? ã??ä½?æ??ã??ã??"
+ 
+ #. Button
+ #: ../client/gtk/connect.c:1377
+-#| msgid "Join private game"
+ msgid "Join Private Game"
+ msgstr "é??å?¬é??ã?²ã?¼ã? ã?«å??å? "
+ 
+@@ -1290,12 +1282,11 @@
+ #. Dialog caption
+ #: ../client/gtk/connect.c:1381 ../client/gtk/connect.c:1526
+ msgid "Join a private game"
+-msgstr "é??å?¬é??å?¬é??ã?²ã?¼ã? ã?«å??å? ã??ã??"
++msgstr "é??å?¬é??ã?²ã?¼ã? ã?«å??å? ã??ã??"
+ 
+ #. Label
+ #. Commandline option of client: hostname of the server
+ #: ../client/gtk/connect.c:1562 ../client/gtk/offline.c:52
+-#| msgid "Server Host"
+ msgid "Server host"
+ msgstr "ã?µã?¼ã??ã??ã?¹ã??"
+ 
+@@ -1309,7 +1300,6 @@
+ #. server port label
+ #: ../client/gtk/connect.c:1580 ../client/gtk/offline.c:55
+ #: ../server/gtk/main.c:531
+-#| msgid "Server Port"
+ msgid "Server port"
+ msgstr "ã?µã?¼ã??ã??ã?¼ã??"
+ 
+@@ -1326,7 +1316,6 @@
+ 
+ #. Caption for list of bought development cards
+ #: ../client/gtk/develop.c:130
+-#| msgid "<b>Development Cards</b>"
+ msgid "<b>Development cards</b>"
+ msgstr "<b>ç?ºå±?ã?«ã?¼ã??</b>"
+ 
+@@ -1337,16 +1326,14 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/discard.c:78
+-#| msgid "Discard resources"
+ msgid "Discard Resources"
+ msgstr "è³?æº?å»?æ£?"
+ 
+ #: ../client/gtk/discard.c:101
+ #, c-format
+-#| msgid "You must discard %d resources"
+ msgid "You must discard %d resource"
+ msgid_plural "You must discard %d resources"
+-msgstr[0] "è³?æº?ã?? %d æ??æ?¨ã?¦ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??"
++msgstr[0] "è³?æº?ã?? %d æ??æ?¨ã?¦ã?ªã??ã??ã?°ã?ªã??ã?ªã??"
+ 
+ #. Label
+ #: ../client/gtk/discard.c:110
+@@ -1360,7 +1347,6 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/gameover.c:34
+-#| msgid "Game over"
+ msgid "Game Over"
+ msgstr "ã?²ã?¼ã? çµ?äº?"
+ 
+@@ -1376,13 +1362,11 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/gold.c:73
+-#| msgid "Choose resources"
+ msgid "Choose Resources"
+ msgstr "è³?æº?é?¸æ??"
+ 
+ #: ../client/gtk/gold.c:96
+ #, c-format
+-#| msgid "You may choose %d resources"
+ msgid "You may choose %d resource"
+ msgid_plural "You may choose %d resources"
+ msgstr[0] "è³?æº?ã?? %d æ??é?¸æ??ã??ã?¦ã??ã? ã??ã??"
+@@ -1405,7 +1389,6 @@
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:232
+-#| msgid "_New game"
+ msgid "_New Game"
+ msgstr "æ?°ã??ã??ã?²ã?¼ã? (_N)"
+ 
+@@ -1416,7 +1399,6 @@
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:237
+-#| msgid "_Leave game"
+ msgid "_Leave Game"
+ msgstr "ã?²ã?¼ã? ã??å?»ã??(_L)"
+ 
+@@ -1437,7 +1419,6 @@
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:249
+-#| msgid "Player Name"
+ msgid "_Player Name"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼å??(_P)"
+ 
+@@ -1486,7 +1467,7 @@
+ #. Tooltop for Quit menu entry
+ #: ../client/gtk/gui.c:271 ../server/gtk/main.c:106
+ msgid "Quit the program"
+-msgstr "ã??ã?ã?°ã?©ã? çµ?äº?"
++msgstr "ã??ã?ã?°ã?©ã? ã??çµ?äº?"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:274
+@@ -1542,7 +1523,7 @@
+ #. Tooltip for Ship menu entry
+ #: ../client/gtk/gui.c:305
+ msgid "Build a ship"
+-msgstr "è?¹ã??é? è?¹ã??ã??"
++msgstr "è?¹ã??è£½é? ã??ã??"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:308
+@@ -1666,7 +1647,7 @@
+ #. Tooltip for Help menu entry
+ #: ../client/gtk/gui.c:375 ../client/gtk/gui.c:1278
+ msgid "Show the manual"
+-msgstr "ã??ã??ã?¥ã?¢ã?«ã??è¦?ã??"
++msgstr "ã??ã??ã?¥ã?¢ã?«ã??è¡¨ç¤ºã??ã??"
+ 
+ #. Menu entry
+ #: ../client/gtk/gui.c:383 ../editor/gtk/editor.c:1367
+@@ -1691,7 +1672,6 @@
+ #. Victory points target in statusbar
+ #: ../client/gtk/gui.c:496
+ #, c-format
+-#| msgid "Points Needed to Win: %i"
+ msgid "Points needed to win: %i"
+ msgstr "å??å?©ã?«å¿?è¦?ã?ªã??ã?¤ã?³ã??: %i"
+ 
+@@ -1706,7 +1686,6 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/gui.c:718
+-#| msgid "_Finish Trading"
+ msgid "Finish trading"
+ msgstr "äº¤æ??ã??çµ?äº?ã??ã??"
+ 
+@@ -1718,7 +1697,6 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/gui.c:730
+-#| msgid "Reject Domestic Trade"
+ msgid "Reject domestic trade"
+ msgstr "å?½å??è²¿æ??ã??æ??å?¦ã??ã??"
+ 
+@@ -1840,7 +1818,6 @@
+ 
+ #. Caption of about box
+ #: ../client/gtk/gui.c:1254
+-#| msgid "_About Pioneers"
+ msgid "About Pioneers"
+ msgstr "Pioneers ã?«ã?¤ã??ã?¦"
+ 
+@@ -1904,19 +1881,16 @@
+ 
+ #. Label
+ #: ../client/gtk/legend.c:135
+-#| msgid "<b>Terrain Yield</b>"
+ msgid "<b>Terrain yield</b>"
+ msgstr "<b>å?°å½¢ã?¨ç?£å?ºè³?æº?</b>"
+ 
+ #. Label
+ #: ../client/gtk/legend.c:168
+-#| msgid "<b>Building Costs</b>"
+ msgid "<b>Building costs</b>"
+ msgstr "<b>å»ºè¨ã?³ã?¹ã??</b>"
+ 
+ #: ../client/gtk/legend.c:206 ../client/gtk/player.c:55
+ #: ../editor/gtk/game-buildings.c:11
+-#| msgid "City Wall"
+ msgid "City wall"
+ msgstr "é?½å¸?å??å£?"
+ 
+@@ -1937,13 +1911,11 @@
+ 
+ #. Dialog caption
+ #: ../client/gtk/name.c:134
+-#| msgid "Change player name"
+ msgid "Change Player Name"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼å??ã??å¤?æ?´"
+ 
+ #. Label
+ #: ../client/gtk/name.c:163
+-#| msgid "Player name"
+ msgid "Player name:"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼å??:"
+ 
+@@ -1962,11 +1934,10 @@
+ msgstr "è¦³æ?¦è??ã?¨ã??ã?¦æ?¥ç¶?ã??ã??"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã?¹ã??"
+ 
+ #: ../client/gtk/offline.c:79
+-#| msgid "Select a game to join"
+ msgid "Select a game to join."
+ msgstr "å??å? ã??ã??ã?²ã?¼ã? ã??é?¸æ??ã??"
+ 
+@@ -2014,23 +1985,19 @@
+ 
+ #. Name of the development card
+ #: ../client/gtk/player.c:59 ../common/cards.c:134
+-#| msgid "Pioneer University"
+ msgid "Pioneer university"
+ msgstr "ã??ã?¤ã?ªã??ã?¢å¤§å¦"
+ 
+ #: ../client/gtk/player.c:59
+-#| msgid "Pioneer Universities"
+ msgid "Pioneer universities"
+ msgstr "ã??ã?¤ã?ªã??ã?¢å¤§å¦"
+ 
+ #. Name of the development card
+ #: ../client/gtk/player.c:61 ../common/cards.c:137
+-#| msgid "Governor's House"
+ msgid "Governor's house"
+ msgstr "å®?è??"
+ 
+ #: ../client/gtk/player.c:61
+-#| msgid "Governor's Houses"
+ msgid "Governor's houses"
+ msgstr "å®?è??"
+ 
+@@ -2076,7 +2043,6 @@
+ 
+ #. Caption for the overview of the points and card of other players
+ #: ../client/gtk/player.c:555
+-#| msgid "<b>Player Summary</b>"
+ msgid "<b>Player summary</b>"
+ msgstr "<b>ã??ã?¬ã?¤ã?¤ã?¼æ¦?è¦?</b>"
+ 
+@@ -2123,7 +2089,6 @@
+ #. Label
+ #. Frame title, trade: I want these resources in return
+ #: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530
+-#| msgid "Give Them"
+ msgid "Give them"
+ msgstr "ã??ã??ã??"
+ 
+@@ -2234,7 +2199,6 @@
+ 
+ #. Label
+ #: ../client/gtk/settingscreen.c:132
+-#| msgid "<b>General Settings</b>"
+ msgid "<b>General settings</b>"
+ msgstr "<b>ä¸?è?¬è¨å®?</b>"
+ 
+@@ -2243,22 +2207,18 @@
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼ã?®ç?ªå?·:"
+ 
+ #: ../client/gtk/settingscreen.c:153
+-#| msgid "Victory Point Target:"
+ msgid "Victory point target:"
+ msgstr "ç?®æ¨?å??å?©ã??ã?¤ã?³ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:157
+-#| msgid "Random Terrain?"
+ msgid "Random terrain:"
+ msgstr "ã?©ã?³ã??ã? å?°å½¢:"
+ 
+ #: ../client/gtk/settingscreen.c:161
+-#| msgid "Allow trade between players"
+ msgid "Allow trade between players:"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼é??ã?®äº¤æ??ã??è¨±å?¯:"
+ 
+ #: ../client/gtk/settingscreen.c:166
+-#| msgid "Allow trade only before building or buying"
+ msgid "Allow trade only before building or buying:"
+ msgstr "å»ºè¨ã??è³¼å?¥ã?®å??ã? ã??äº¤æ??ã??è¨±å?¯:"
+ 
+@@ -2267,28 +2227,23 @@
+ msgstr "ã?¿ã?¼ã?³ã?®æ??å¾?ã?«ã?®ã?¿å??å?©å?¤å®?:"
+ 
+ #: ../client/gtk/settingscreen.c:176
+-#| msgid "Amount of Each Resource:"
+ msgid "Amount of each resource:"
+ msgstr "å??ã??ã?®è³?æº?ã?®ç·?é??:"
+ 
+ #: ../client/gtk/settingscreen.c:190
+-#| msgid "Sevens rule"
+ msgid "Sevens rule:"
+ msgstr "7ã?®ç?®ã?®ã?«ã?¼ã?«:"
+ 
+ #: ../client/gtk/settingscreen.c:196
+-#| msgid "Use the pirate to block ships"
+ msgid "Use the pirate to block ships:"
+ msgstr "è?¹ã??æ¢ã??ã??ã??ã??ã?«æµ·è³?ã??ä½¿ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:225
+-#| msgid "Island Discovery Bonuses:"
+ msgid "Island discovery bonuses:"
+ msgstr "å³¶ç?ºè¦?ã??ã?¼ã??ã?¹:"
+ 
+ #. Label
+ #: ../client/gtk/settingscreen.c:242
+-#| msgid "<b>Building Quotas</b>"
+ msgid "<b>Building quotas</b>"
+ msgstr "<b>å»ºç¯?ç?©å?²ã??å½?ã?¦</b>"
+ 
+@@ -2305,7 +2260,6 @@
+ msgstr "é?½å¸?:"
+ 
+ #: ../client/gtk/settingscreen.c:277
+-#| msgid "City Walls:"
+ msgid "City walls:"
+ msgstr "é?½å¸?å??å£?:"
+ 
+@@ -2319,52 +2273,42 @@
+ 
+ #. Label
+ #: ../client/gtk/settingscreen.c:302
+-#| msgid "<b>Development Card Deck</b>"
+ msgid "<b>Development card deck</b>"
+ msgstr "<b>ç?ºå±?ã?«ã?¼ã??ã??ã??ã?</b>"
+ 
+ #: ../client/gtk/settingscreen.c:318
+-#| msgid "Road Building Cards:"
+ msgid "Road building cards:"
+ msgstr "è¡?é??æ?·è¨ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:322
+-#| msgid "Monopoly Cards:"
+ msgid "Monopoly cards:"
+ msgstr "ç?¬å? ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:326
+-#| msgid "Year of Plenty Cards:"
+ msgid "Year of plenty cards:"
+ msgstr "å??ç©«ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:330
+-#| msgid "Chapel Cards:"
+ msgid "Chapel cards:"
+ msgstr "æ??ä¼?ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:334
+-#| msgid "Pioneer University Cards:"
+ msgid "Pioneer university cards:"
+ msgstr "ã??ã?¤ã?ªã??ã?¢å¤§å¦ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:338
+-#| msgid "Governor's House Cards:"
+ msgid "Governor's house cards:"
+ msgstr "å®?è??ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:342
+-#| msgid "Library Cards:"
+ msgid "Library cards:"
+ msgstr "å?³æ?¸é¤¨ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:346
+-#| msgid "Market Cards:"
+ msgid "Market cards:"
+ msgstr "å¸?å ´ã?«ã?¼ã??:"
+ 
+ #: ../client/gtk/settingscreen.c:350
+-#| msgid "Soldier Cards:"
+ msgid "Soldier cards:"
+ msgstr "é¨?å£«ã?«ã?¼ã??:"
+ 
+@@ -2420,13 +2364,11 @@
+ 
+ #. Name of the development card
+ #: ../common/cards.c:122
+-#| msgid "Road Building"
+ msgid "Road building"
+ msgstr "è¡?é??æ?·è¨"
+ 
+ #. Name of the development card
+ #: ../common/cards.c:128
+-#| msgid "Year of Plenty"
+ msgid "Year of plenty"
+ msgstr "å??ç©«"
+ 
+@@ -2440,7 +2382,8 @@
+ msgid ""
+ "Select a resource type and take every card of that type held by all other "
+ "players"
+-msgstr "è³?æº?ã??1ç¨®é¡?æ??å®?ã??ã??ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼å?¨å?¡ã??ã??ã??ã?®ç¨®é¡?ã?®ã?«ã?¼ã??ã??ã??ã?¹ã?¦ã??ã??ã??"
++msgstr ""
++"è³?æº?ã??1ç¨®é¡?æ??å®?ã??ã??ä»?ã?®ã??ã?¬ã?¤ã?¤ã?¼å?¨å?¡ã??ã??ã??ã?®ç¨®é¡?ã?®ã?«ã?¼ã??ã??ã??ã?¹ã?¦ã??ã??ã??"
+ 
+ #. Description of the 'Year of Plenty' development card
+ #: ../common/cards.c:164
+@@ -2459,7 +2402,9 @@
+ msgid ""
+ "Move the robber to a different space and take one resource card from another "
+ "player adjacent to that space"
+-msgstr "ç??è³?ã??é??ã??å ´æ??ã?«ç§»å??ã??ã??ç§»å??ã??ã??å ´æ??ã?«é?£æ?¥ã??ã??ä»?ã??ã?¬ã?¤ã?¤ã?¼ä¸?äººã??ã??è³?æº?ã?«ã?¼ã??ã??1æ??ã??ã??ã??"
++msgstr ""
++"ç??è³?ã??é??ã??å ´æ??ã?«ç§»å??ã??ã??ç§»å??ã??ã??å ´æ??ã?«é?£æ?¥ã??ã??ä»?ã??ã?¬ã?¤ã?¤ã?¼ä¸?äººã??ã??è³?æº?ã?«ã?¼ã??"
++"ã??1æ??ã??ã??ã??"
+ 
+ #: ../common/game.c:499
+ #, c-format
+@@ -2471,7 +2416,9 @@
+ msgid ""
+ "The game uses the new rule '%s', which is not yet supported. Consider "
+ "upgrading.\n"
+-msgstr "ã??ã?®ã?²ã?¼ã? ã?¯ã?¾ã? ã?µã??ã?¼ã??ã??ã?¦ã?¦ã??ã?ªã??æ?°ã??ã??ã?«ã?¼ã?« '%s' ã??ä½¿ã?£ã?¦ã??ã??ã??ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??æ¤?è¨?ã??ã?¦ã??ã? ã??ã??ã??\n"
++msgstr ""
++"ã??ã?®ã?²ã?¼ã? ã?¯ã?¾ã? ã?µã??ã?¼ã??ã??ã?¦ã?¦ã??ã?ªã??æ?°ã??ã??ã?«ã?¼ã?« '%s' ã??ä½¿ã?£ã?¦ã??ã??ã??ã?¢ã??ã??ã?°"
++"ã?¬ã?¼ã??ã??æ¤?è¨?ã??ã?¦ã??ã? ã??ã??ã??\n"
+ 
+ #: ../common/game.c:890 ../common/game.c:921
+ msgid "This game cannot be won."
+@@ -2501,7 +2448,7 @@
+ msgstr ""
+ "å¿?è¦?ã?ªå??å?©ã??ã?¤ã?³ã??: %d\n"
+ "ã??ã?¹ã?¦å»ºè¨ã??ã??ã?¨ã??ã?®ç?²å¾?ã??ã?¤ã?³ã??: %d\n"
+-"ç?ºå±?ã?«ã?¼ã??ã?«ã??ã??ã??ã?¤ã?³ã??: %d\n"
++"ç?ºå±?ã?«ã?¼ã??ã?«ã??ã??ã??ã?¤ã?³ã??: %u\n"
+ "æ??é?·äº¤æ??è·¯/æ??å¤§å?µå??: %d+%d\n"
+ "æ??å¤§å³¶ç?ºè¦?ã??ã?¼ã??ã?¹: %d\n"
+ "å??è¨?: %d"
+@@ -2528,7 +2475,7 @@
+ 
+ #. Translators: add your name here. Keep the list alphabetically,
+ #. * do not remove any names, and add \n after your name (except the last name).
+-#. 
++#.
+ #: ../common/gtk/aboutbox.c:104 ../common/gtk/aboutbox.c:115
+ msgid "translator_credits"
+ msgstr ""
+@@ -2563,7 +2510,6 @@
+ msgstr "ã?©ã?®ã?¿ã?¼ã?³ã?§ã??7ã?®ç?®ã??å?ºã??ã??æ?¯ã??ç?´ã??"
+ 
+ #: ../common/gtk/game-rules.c:118
+-#| msgid "Randomize Terrain"
+ msgid "Randomize terrain"
+ msgstr "ã?©ã?³ã??ã? å?°å½¢"
+ 
+@@ -2572,7 +2518,6 @@
+ msgstr "å?°å½¢ã??ã?©ã?³ã??ã? ã?«ã??ã??"
+ 
+ #: ../common/gtk/game-rules.c:121
+-#| msgid "Use Pirate"
+ msgid "Use pirate"
+ msgstr "æµ·è³?ä½¿ç?¨"
+ 
+@@ -2581,7 +2526,6 @@
+ msgstr "è?¹ã??æ¢ã??ã??ã??ã??ã?«æµ·è³?ã??ä½¿ã??"
+ 
+ #: ../common/gtk/game-rules.c:124
+-#| msgid "Strict Trade"
+ msgid "Strict trade"
+ msgstr "äº¤æ??ã?¯å?³å¯?ã?«"
+ 
+@@ -2590,7 +2534,6 @@
+ msgstr "å»ºè¨ã??è³¼å?¥ã?®å??ã? ã??äº¤æ??ã??è¨±å?¯ã??ã??"
+ 
+ #: ../common/gtk/game-rules.c:127
+-#| msgid "Domestic Trade"
+ msgid "Domestic trade"
+ msgstr "å?½å??è²¿æ??"
+ 
+@@ -2617,13 +2560,12 @@
+ msgstr "å³¶ç?ºè¦?æ??ã?®ã??ã?¼ã??ã?¹ã??ã?¤ã?³ã??ã?®ã?«ã?³ã??å?ºå??ã??ã?®ã?ªã?¹ã??"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "å³¶ç?ºè¦?ã??ã?¼ã??ã?¹ã?®ã??ã?§ã??ã?¯ã?¨ä¿®æ£"
+ 
+ #. Label text for customising a game
+ #: ../common/gtk/game-settings.c:106
+-#| msgid "Number of players:"
+ msgid "Number of players"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼æ?°"
+ 
+@@ -2634,7 +2576,6 @@
+ 
+ #. Label for customising a game
+ #: ../common/gtk/game-settings.c:128
+-#| msgid "Victory Point Target"
+ msgid "Victory point target"
+ msgstr "ç?®æ¨?å??å?©ã??ã?¤ã?³ã??"
+ 
+@@ -2686,7 +2627,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??é?¸æ??"
+ 
+ #. Tooltip for the list of games
+@@ -3040,7 +2981,6 @@
+ #. Caption
+ #. Game settings frame
+ #: ../editor/gtk/editor.c:884 ../server/gtk/main.c:943
+-#| msgid "Game Parameters"
+ msgid "Game parameters"
+ msgstr "ã?²ã?¼ã? ã??ã?©ã?¡ã?¼ã?¿"
+ 
+@@ -3092,7 +3032,6 @@
+ 
+ #. Dialog caption
+ #: ../editor/gtk/editor.c:1137
+-#| msgid "Save _As..."
+ msgid "Save As..."
+ msgstr "å??å??ã??ã?¤ã??ã?¦ä¿?å?..."
+ 
+@@ -3103,13 +3042,11 @@
+ 
+ #. Label
+ #: ../editor/gtk/editor.c:1206
+-#| msgid "New Title:"
+ msgid "New title:"
+ msgstr "æ?°ã??ã??ã?¿ã?¤ã??ã?«:"
+ 
+ #. About dialog caption
+ #: ../editor/gtk/editor.c:1264
+-#| msgid "_About Pioneers Editor"
+ msgid "About Pioneers Game Editor"
+ msgstr "Pioneers ã?²ã?¼ã? ã?¨ã??ã?£ã?¿ã?«ã?¤ã??ã?¦"
+ 
+@@ -3125,7 +3062,7 @@
+ 
+ #: ../editor/gtk/editor.c:1305
+ msgid "Create a new game"
+-msgstr "æ?°ã?²ã?¼ã? ä½?æ??"
++msgstr "æ?°ã??ã??ã?²ã?¼ã? ã??ä½?æ??"
+ 
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1308
+@@ -3135,7 +3072,7 @@
+ #. Tooltip for Open menu entry
+ #: ../editor/gtk/editor.c:1310
+ msgid "Open an existing game"
+-msgstr "å?å?¨ã??ã??ã?²ã?¼ã? ã??é??ã??"
++msgstr "æ?¢å?ã?®ã?²ã?¼ã? ã??é??ã??"
+ 
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1313
+@@ -3159,7 +3096,6 @@
+ 
+ #. Menu entry
+ #: ../editor/gtk/editor.c:1324
+-#| msgid "Change Title"
+ msgid "_Change Title"
+ msgstr "ã?¿ã?¤ã??ã?«ã??å¤?æ?´(_C)"
+ 
+@@ -3227,7 +3163,6 @@
+ msgstr "ã?³ã?¡ã?³ã??"
+ 
+ #: ../editor/gtk/game-resources.c:48
+-#| msgid "Resource Count"
+ msgid "Resource count"
+ msgstr "è³?æº?æ?°"
+ 
+@@ -3237,7 +3172,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??é??å§?æ??ã?«ã??ã?¼ã?¢ã?³å??ã??ã??"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3247,7 +3182,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "ã?¯ã?©ã?¤ã?¢ã?³ã??ã??ä»?ã?®ã?¡ã?¿ã?µã?¼ã??ã?«è»¢é??ã??ã??"
+ 
+ #. Commandline meta-server: server
+@@ -3277,12 +3212,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Pioneers ã?®ã?¡ã?¿ã?µã?¼ã??"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã?ã??ã?³ã?«:"
+ 
+ #: ../server/avahi.c:68
+@@ -3361,24 +3296,23 @@
+ 
+ #. register_toggle
+ #: ../server/gtk/main.c:555
+-#| msgid "Register Server"
+ msgid "Register server"
+ msgstr "ã?µã?¼ã??ç?»é?²"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "ã??ã?®ã?²ã?¼ã? ã??ã?¡ã?¿ã?µã?¼ã??ä¸?ã?«ç?»é?²ã??ã??"
+ 
+ #. hostname label
+ #: ../server/gtk/main.c:595
+-#| msgid "Reported Hostname"
+ msgid "Reported hostname"
+ msgstr "å ±å??ã??ã??ã??ã?¹ã??å??"
+ 
+ #: ../server/gtk/main.c:610
+ msgid ""
+ "The public name of this computer (needed when playing behind a firewall)"
+-msgstr "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®å?¬é??å?? (ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã?®ä¸ã??ã??ã??ã?¬ã?¤ã??ã??å ´å??ã?¯å¿?è¦?)"
++msgstr ""
++"ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®å?¬é??å?? (ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã?®ä¸ã??ã??ã??ã?¬ã?¤ã??ã??å ´å??ã?¯å¿?è¦?)"
+ 
+ #. random toggle
+ #: ../server/gtk/main.c:629
+@@ -3451,13 +3385,11 @@
+ 
+ #. Tooltip
+ #: ../server/gtk/main.c:809
+-#| msgid "Launch the Pioneers Client"
+ msgid "Launch the Pioneers client"
+ msgstr "Pioneers ã?¯ã?©ã?¤ã?¢ã?³ã??ã??èµ·å??ã??ã??"
+ 
+ #. ai chat toggle
+ #: ../server/gtk/main.c:843
+-#| msgid "Enable Chat"
+ msgid "Enable chat"
+ msgstr "ã??ã?£ã??ã??å?¯"
+ 
+@@ -3482,30 +3414,25 @@
+ msgstr "ã?µã?¼ã??ã??ã??ã?®ã?¡ã??ã?»ã?¼ã?¸"
+ 
+ #: ../server/gtk/main.c:936
+-#| msgid "Game Settings"
+ msgid "Game settings"
+ msgstr "ã?²ã?¼ã? è¨å®?"
+ 
+ #. server frame
+ #: ../server/gtk/main.c:947
+-#| msgid "Server Parameters"
+ msgid "Server parameters"
+ msgstr "ã?µã?¼ã??ã??ã?©ã?¡ã?¼ã?¿"
+ 
+ #: ../server/gtk/main.c:967
+-#| msgid "Running Game"
+ msgid "Running game"
+ msgstr "ã?²ã?¼ã? é?²è¡?ä¸"
+ 
+ #. player connected frame
+ #: ../server/gtk/main.c:983
+-#| msgid "Players Connected"
+ msgid "Players connected"
+ msgstr "ã??ã?¬ã?¤ã?¤ã?¼æ?¥ç¶?"
+ 
+ #. ai frame
+ #: ../server/gtk/main.c:987
+-#| msgid "Computer Players"
+ msgid "Computer players"
+ msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼"
+ 
+@@ -3521,7 +3448,7 @@
+ 
+ #. Wait for all players to disconnect,
+ #. * then enable the UI
+-#. 
++#.
+ #: ../server/gtk/main.c:1118
+ msgid "The game is over.\n"
+ msgstr "ã?²ã?¼ã? çµ?äº?ã??\n"
+@@ -3583,12 +3510,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã?«ã?µã?¼ã??ã??è¿½å? ã??ã??"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??å??ã??ç?»é?²ã??ã?? (-r ã??å?«æ??)"
+ 
+ #. Commandline server-console: hostname
+@@ -3628,13 +3555,13 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "ã?¡ã?¿ã?µã?¼ã??ã?ªã??ã?·ã?§ã?³"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
+-msgstr "ã?¡ã?¿ã?µã?¼ã??ã?¸ã?®ã?ªã??ã?·ã?§ã?³"
++msgid "Options for the metaserver"
++msgstr "ã?¡ã?¿ã?µã?¼ã??ã?®ã?ªã??ã?·ã?§ã?³"
+ 
+ #. Commandline server-console: Short description of misc group
+ #: ../server/main.c:193
+@@ -3661,8 +3588,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "ç®¡ç??ã??ã?¼ã??ã??å?©ç?¨ã?§ã??ã?ªã??ã??\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "ç®¡ç??ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã??ã?¼ã?? (%s) ã??å?©ç?¨ä¸?å?¯ã??\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3672,12 +3599,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "%s ã?®ã??ã?¼ã?? %s ã?§ã?¡ã?¿ã?µã?¼ã??ã?«ç?»é?²\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "%s ã?®ã??ã?¼ã?? %s ã?§ã?¡ã?¿ã?µã?¼ã??ã?«ç?»é?²ã??\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã??ç?»é?²è§£é?¤\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "ã?¡ã?¿ã?µã?¼ã??ã??ã??ç?»é?²è§£é?¤ã??\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+@@ -3715,7 +3642,7 @@
+ 
+ #. Default name for the AI when the computer_names file
+ #. * is not found or empty.
+-#. 
++#.
+ #: ../server/player.c:368 ../server/player.c:374
+ msgid "Computer Player"
+ msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã??ã?¬ã?¤ã?¤ã?¼"
+diff -u --label pioneers-14.1.orig/po/nl.po --label pioneers-14.1/po/nl.po 	     .pc/svn1860-2091_po.diff/po/nl.po po/nl.po
+Index: pioneers-14.1/po/nl.po
+===================================================================
+--- pioneers-14.1.orig/po/nl.po
++++ pioneers-14.1/po/nl.po
+@@ -2,14 +2,14 @@
+ # Copyright (C) 2003 Bas Wijnen
+ # This file is distributed under the same license as the pioneers package.
+ # Bas Wijnen <b.wijnen@phys.rug.nl>, 2003-2004
+-# Roland Clobus <rclobus@rclobus.nl>, 2005-2012
++# Roland Clobus <rclobus@rclobus.nl>, 2005-2014
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Pioneers 14.1\n"
++"Project-Id-Version: Pioneers 15.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
+-"PO-Revision-Date: 2012-11-02 10:52+0100\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2013-09-08 18:00+0100\n"
+ "Last-Translator: Roland Clobus <rclobus@rclobus.nl>\n"
+ "Language-Team: Bas Wijnen <shevek@fmf.nl> Roland Clobus <rclobus@rclobus."
+ "nl>\n"
+@@ -17,7 +17,8 @@
+ "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"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n"
++"X-Generator: Poedit 1.5.4\n"
+ 
+ #. Commandline pioneersai: server
+ #: ../client/ai/ai.c:70
+@@ -971,7 +972,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Metaserver op %s, poort %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -980,17 +981,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "De metaserver heeft de verbinding verbroken.\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "De metaserver heeft de verbinding onverwacht gesloten.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "De metaserver stuurt de spelnamen door.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Er is een nieuwe server gestart op %s, poort %s.\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Er is een nieuwe server aangevraagd op %s poort %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -998,7 +999,7 @@
+ msgstr "Onbekende gegevens ontvangen van de metaserver: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
++msgid "Too many metaserver redirects.\n"
+ msgstr "Teveel metaserver omleidingen.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+@@ -1008,7 +1009,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "De metaserver is te oud om servers te starten (versie %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1039,11 +1040,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
+ msgstr "We worden doorgestuurd naar de metaserver op %s, poort %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "De metaserver stuurt een lijst Pioniers servers.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1067,8 +1068,8 @@
+ msgstr "Het aantal computerspelers"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Een nieuwe server wordt aangevraagd.\n"
++msgid "Requesting new game server.\n"
++msgstr "Een nieuwe spelserver wordt aangevraagd.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1097,7 +1098,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Een nieuw spel via de metaserver starten"
+ 
+ #. Tooltip
+@@ -1250,7 +1251,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaserver"
+ 
+ #. Button
+@@ -1937,7 +1938,7 @@
+ msgstr "Meespelen als toeschouwer"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "Computernaam van de metaserver"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2479,6 +2480,7 @@
+ msgid "Authors:"
+ msgstr "Geschreven door:"
+ 
++#
+ #. Translators: add your name here. Keep the list alphabetically,
+ #. * do not remove any names, and add \n after your name (except the last name).
+ #.
+@@ -2565,7 +2567,7 @@
+ "Een komma-gescheiden lijst van bonuspunten voor het ontdekken van eilanden"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Controleer en corrigeer de eiland ontdekkingspunten"
+ 
+@@ -2632,7 +2634,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Kies een metaserver"
+ 
+ #. Tooltip for the list of games
+@@ -3178,7 +3180,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "Start de metaserver als achtergrond taak"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3188,7 +3190,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Omleiding naar een andere metaserver"
+ 
+ #. Commandline meta-server: server
+@@ -3218,12 +3220,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Metaserver voor Pioniers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "Metaserver protocol:"
+ 
+ #: ../server/avahi.c:68
+@@ -3306,7 +3308,7 @@
+ msgstr "Server registreren"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Dit spel bij de metaserver aanmelden"
+ 
+ #. hostname label
+@@ -3517,12 +3519,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registreer dit spel bij de metaserver"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registreer bij metaserver naam (betekent -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3562,12 +3564,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Metaserver opties"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Opties voor de metaserver"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3595,8 +3597,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Poort voor beheers is niet beschikbaar.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "De netwerkpoort (%s) voor de beheerderstoegang is niet beschikbaar.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3608,12 +3610,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Bezig te verbinden met metaserver op %s, poort %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Bezig te verbinden met metaserver op %s, poort %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Verbreek de verbinding met de metaserver\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Verbreek de verbinding met de metaserver.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/pt.po --label pioneers-14.1/po/pt.po 	     .pc/svn1860-2091_po.diff/po/pt.po po/pt.po
+Index: pioneers-14.1/po/pt.po
+===================================================================
+--- pioneers-14.1.orig/po/pt.po
++++ pioneers-14.1/po/pt.po
+@@ -6,7 +6,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 14.1\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2012-05-22 10:11+0000\n"
+ "Last-Translator: Filipe Roque <Unknown>\n"
+ "Language-Team: Portuguese <pt@li.org>\n"
+@@ -970,7 +970,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Meta-servidor em %s, porta %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -979,16 +979,16 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Meta-servidor expulsou-nos\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Meta-servidor expulsou-nos.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Recebendo nomes do jogo do Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
+ msgstr "Novo servidor de jogo solicitado em %s porta %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+@@ -997,8 +997,8 @@
+ msgstr "Mensagem desconhecida do Meta-servidor: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "Demasiados redireccionamentos do Meta-servidor\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "Demasiados redireccionamentos do Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1007,7 +1007,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Meta-servidor muito velho para criar servidores (versÃ£o %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1038,11 +1038,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
+-msgstr "Redireccionado para o Meta-servidor em %s, porta %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "Redireccionado para o Meta-servidor em %s, porta %s.\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Recebendo uma lista de servidores Pioneers do Meta-servidor.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1066,8 +1066,8 @@
+ msgstr "O nÃºmero de computadores a jogar"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "Pedindo novo servidor de jogo\n"
++msgid "Requesting new game server.\n"
++msgstr "Pedindo novo servidor de jogo.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, c-format
+@@ -1096,7 +1096,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Criar um novo jogo pÃºblico no Meta-servidor"
+ 
+ #. Tooltip
+@@ -1249,7 +1249,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Meta-servidor"
+ 
+ #. Button
+@@ -1937,7 +1937,7 @@
+ msgstr "Ligar-se como espectador"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "AnfitriÃ£o do Meta-servidor"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2567,7 +2567,7 @@
+ msgstr "Uma lista separada por vÃrgulas de pontos bÃ³nus por descobrir ilhas"
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Verificar e corrigir bÃ³nus de descoberta de ilhas"
+ 
+@@ -2634,7 +2634,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "Escolha um meta-servidor"
+ 
+ #. Tooltip for the list of games
+@@ -3179,7 +3179,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "Processificar o meta-servidor ao arrancar"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3189,7 +3189,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Redirecionar clientes para outro meta-servidor"
+ 
+ #. Commandline meta-server: server
+@@ -3219,12 +3219,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Meta server para Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "protocolo meta-servidor:"
+ 
+ #: ../server/avahi.c:68
+@@ -3307,7 +3307,7 @@
+ msgstr "Registrar o servidor"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registrar este jogo no Meta-servidor"
+ 
+ #. hostname label
+@@ -3518,12 +3518,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registrar o servidor com o Meta-servidor"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registro em nome de Meta-servidor (supÃµe -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3566,12 +3566,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "OpÃ§Ãµes de Meta-servidor"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "OpÃ§oes para o Meta-servidor"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3600,8 +3600,8 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
+-msgstr "Porta de administraÃ§Ã£o nÃ£o disponÃvel\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "Porta de administraÃ§Ã£o (%s) nÃ£o disponÃvel.\n"
+ 
+ #. server-console commandline error
+ #: ../server/main.c:282
+@@ -3613,12 +3613,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registrar no Meta-servidor em %s, porta %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registrar no Meta-servidor em %s, porta %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Desregistrar do Meta-servidor\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Desregistrar do Meta-servidor.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/po/sv.po --label pioneers-14.1/po/sv.po 	     .pc/svn1860-2091_po.diff/po/sv.po po/sv.po
+Index: pioneers-14.1/po/sv.po
+===================================================================
+--- pioneers-14.1.orig/po/sv.po
++++ pioneers-14.1/po/sv.po
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: Pioneers 0.12.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-05-28 11:51+0200\n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
+ "PO-Revision-Date: 2011-10-30 15:06+0100\n"
+ "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
+ "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+@@ -971,7 +971,7 @@
+ 
+ #: ../client/gtk/connect.c:277
+ #, c-format
+-msgid "Meta-server at %s, port %s"
++msgid "Metaserver at %s, port %s"
+ msgstr "Metaserver pÃ¥ %s, port %s"
+ 
+ #: ../client/gtk/connect.c:287
+@@ -980,17 +980,17 @@
+ 
+ #: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
+ #: ../client/gtk/connect.c:454 ../server/meta.c:169
+-msgid "Meta-server kicked us off\n"
+-msgstr "Metaserver sparkade ut oss\n"
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "Metaserver sparkade ut oss.\n"
+ 
+ #: ../client/gtk/connect.c:329
+-msgid "Receiving game names from the meta server.\n"
++msgid "Receiving game names from the metaserver.\n"
+ msgstr "Tar emot spelnamn frÃ¥n metaservern.\n"
+ 
+ #: ../client/gtk/connect.c:376
+ #, c-format
+-msgid "New game server requested on %s port %s\n"
+-msgstr "Ny spelserver begÃ¤rd pÃ¥ %s port %s\n"
++msgid "New game server requested on %s port %s.\n"
++msgstr "Ny spelserver begÃ¤rd pÃ¥ %s port %s.\n"
+ 
+ #: ../client/gtk/connect.c:385 ../server/meta.c:162
+ #, c-format
+@@ -998,8 +998,8 @@
+ msgstr "OkÃ¤nt meddelande frÃ¥n metaservern: %s\n"
+ 
+ #: ../client/gtk/connect.c:469 ../server/meta.c:119
+-msgid "Too many meta-server redirects\n"
+-msgstr "FÃ¶r mÃ¥nga omdirigeringar fÃ¶r metaserver\n"
++msgid "Too many metaserver redirects.\n"
++msgstr "FÃ¶r mÃ¥nga omdirigeringar fÃ¶r metaserver.\n"
+ 
+ #: ../client/gtk/connect.c:496 ../server/meta.c:134
+ #, c-format
+@@ -1008,7 +1008,7 @@
+ 
+ #: ../client/gtk/connect.c:522
+ #, c-format
+-msgid "Meta server too old to create servers (version %d.%d)\n"
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
+ msgstr "Metaserver fÃ¶r gammal fÃ¶r att skapa servrar (version %d.%d)\n"
+ 
+ #. Sevens rule: normal
+@@ -1039,11 +1039,11 @@
+ 
+ #: ../client/gtk/connect.c:650 ../server/meta.c:182
+ #, c-format
+-msgid "Redirected to meta-server at %s, port %s\n"
++msgid "Redirected to the metaserver at %s, port %s.\n"
+ msgstr "Omdirigerad till metaserver pÃ¥ %s, port %s\n"
+ 
+ #: ../client/gtk/connect.c:653
+-msgid "Receiving a list of Pioneers servers from the meta server.\n"
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
+ msgstr "Tar emot en lista av Pioneers-servrar frÃ¥n metaservern.\n"
+ 
+ #: ../client/gtk/connect.c:708
+@@ -1069,8 +1069,8 @@
+ msgstr "Antalet spelare"
+ 
+ #: ../client/gtk/connect.c:767
+-msgid "Requesting new game server\n"
+-msgstr "BegÃ¤r en ny spelserver\n"
++msgid "Requesting new game server.\n"
++msgstr "BegÃ¤r en ny spelserver.\n"
+ 
+ #: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
+ #, fuzzy, c-format
+@@ -1099,7 +1099,7 @@
+ 
+ #. Tooltip
+ #: ../client/gtk/connect.c:979
+-msgid "Create a new public game at the meta server"
++msgid "Create a new public game at the metaserver"
+ msgstr "Skapa ett nytt publikt spel pÃ¥ metaservern"
+ 
+ #. Tooltip
+@@ -1254,7 +1254,7 @@
+ #. Label
+ #. meta server label
+ #: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
+-msgid "Meta server"
++msgid "Metaserver"
+ msgstr "Metaserver"
+ 
+ #. Button
+@@ -1940,7 +1940,7 @@
+ msgstr "Anslut som en Ã¥skÃ¥dare"
+ 
+ #: ../client/gtk/offline.c:65
+-msgid "Meta-server Host"
++msgid "Metaserver Host"
+ msgstr "MetaservervÃ¤rd"
+ 
+ #: ../client/gtk/offline.c:79
+@@ -2563,7 +2563,7 @@
+ msgstr ""
+ 
+ #. Tooltip for the check button
+-#: ../common/gtk/game-rules.c:163
++#: ../common/gtk/game-rules.c:165
+ #, fuzzy
+ msgid "Check and correct island discovery bonuses"
+ msgstr "Bonusar fÃ¶r upptÃ¤ckter av Ã¶ar:"
+@@ -2631,7 +2631,7 @@
+ 
+ #. Tooltip for the list of meta servers
+ #: ../common/gtk/metaserver.c:86
+-msgid "Select a meta server"
++msgid "Select a metaserver"
+ msgstr "VÃ¤lj en metaserver"
+ 
+ #. Tooltip for the list of games
+@@ -3177,7 +3177,7 @@
+ 
+ #. Commandline meta-server: daemon
+ #: ../meta-server/main.c:1069
+-msgid "Daemonize the meta-server on start"
++msgid "Daemonize the metaserver on start"
+ msgstr "KÃ¶r metaserver som bakgrundsprocess vid start"
+ 
+ #. Commandline meta-server: pidfile
+@@ -3187,7 +3187,7 @@
+ 
+ #. Commandline meta-server: redirect
+ #: ../meta-server/main.c:1077
+-msgid "Redirect clients to another meta-server"
++msgid "Redirect clients to another metaserver"
+ msgstr "Omdirigerar klienter till en annan metaserver"
+ 
+ #. Commandline meta-server: server
+@@ -3217,12 +3217,12 @@
+ 
+ #. Long description in the commandline for server-console: help
+ #: ../meta-server/main.c:1119
+-msgid "- Meta server for Pioneers"
++msgid "- Metaserver for Pioneers"
+ msgstr "- Metaserver fÃ¶r Pioneers"
+ 
+ #: ../meta-server/main.c:1135
+ #, c-format
+-msgid "meta-server protocol:"
++msgid "metaserver protocol:"
+ msgstr "protokoll fÃ¶r metaserver:"
+ 
+ #: ../server/avahi.c:68
+@@ -3305,7 +3305,7 @@
+ msgstr "Registrera server"
+ 
+ #: ../server/gtk/main.c:563
+-msgid "Register this game at the meta server"
++msgid "Register this game at the metaserver"
+ msgstr "Registrera detta spel pÃ¥ metaservern"
+ 
+ #. hostname label
+@@ -3516,12 +3516,12 @@
+ 
+ #. Commandline server-console: register
+ #: ../server/main.c:107
+-msgid "Register server with meta-server"
++msgid "Register server with metaserver"
+ msgstr "Registrera server med metaserver"
+ 
+ #. Commandline server-console: meta-server
+ #: ../server/main.c:110
+-msgid "Register at meta-server name (implies -r)"
++msgid "Register at metaserver name (implies -r)"
+ msgstr "Registrera mot metaserver (fÃ¶rutsÃ¤tter -r)"
+ 
+ #. Commandline server-console: hostname
+@@ -3562,12 +3562,12 @@
+ 
+ #. Commandline server-console: Short description of meta group
+ #: ../server/main.c:182
+-msgid "Meta-server Options"
++msgid "Metaserver Options"
+ msgstr "Metaserveralternativ"
+ 
+ #. Commandline server-console: Long description of meta group
+ #: ../server/main.c:184
+-msgid "Options for the meta-server"
++msgid "Options for the metaserver"
+ msgstr "Alternativ fÃ¶r metaservern"
+ 
+ #. Commandline server-console: Short description of misc group
+@@ -3595,7 +3595,7 @@
+ #. Error message
+ #: ../server/main.c:275
+ #, c-format
+-msgid "Admin port not available.\n"
++msgid "The network port (%s) for the admin interface is not available.\n"
+ msgstr ""
+ 
+ #. server-console commandline error
+@@ -3608,12 +3608,12 @@
+ 
+ #: ../server/meta.c:187
+ #, c-format
+-msgid "Register with meta-server at %s, port %s\n"
+-msgstr "Registrera mot metaservern pÃ¥ %s, port %s\n"
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "Registrera mot metaservern pÃ¥ %s, port %s.\n"
+ 
+ #: ../server/meta.c:205
+-msgid "Unregister from meta-server\n"
+-msgstr "Avregistrera frÃ¥n metaserver\n"
++msgid "Unregister from the metaserver.\n"
++msgstr "Avregistrera frÃ¥n metaserver.\n"
+ 
+ #: ../server/player.c:140
+ msgid "chat too long"
+diff -u --label pioneers-14.1.orig/client/gtk/connect.c --label pioneers-14.1/client/gtk/connect.c 	     .pc/svn1860-2091_po.diff/client/gtk/connect.c client/gtk/connect.c
+Index: pioneers-14.1/client/gtk/connect.c
+===================================================================
+--- pioneers-14.1.orig/client/gtk/connect.c
++++ pioneers-14.1/client/gtk/connect.c
+@@ -301,7 +301,7 @@
+ 	case NET_CLOSE:
+ 		if (gametype_mode == GAMETYPE_MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Metaserver kicked us off\n"));
++				    _("The metaserver closed the connection unexpectedly.\n"));
+ 		net_free(&gametype_ses);
+ 		close_waiting_box();
+ 		break;
+@@ -351,7 +351,7 @@
+ 	case NET_CLOSE:
+ 		if (create_mode == CREATE_MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Metaserver kicked us off\n"));
++				    _("The metaserver closed the connection unexpectedly.\n"));
+ 		net_free(&create_ses);
+ 		break;
+ 	case NET_READ:
+@@ -374,7 +374,7 @@
+ 			else if (strcmp(line, "started") == 0) {
+ 				log_message(MSG_INFO,
+ 					    _(""
+-					      "New game server requested on %s port %s\n"),
++					      "New game server requested on %s port %s.\n"),
+ 					    connect_server, connect_port);
+ 				/* The meta server is now busy creating the new game.
+ 				 * UGLY FIX: Wait for some time */
+@@ -451,7 +451,7 @@
+ 	case NET_CLOSE:
+ 		if (meta_mode == MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Metaserver kicked us off\n"));
++				    _("The metaserver closed the connection unexpectedly.\n"));
+ 		close_waiting_box();
+ 		net_free(&ses);
+ 		break;
+@@ -467,7 +467,7 @@
+ 				if (metaserver_info.num_redirects++ == 10) {
+ 					log_message(MSG_INFO,
+ 						    _(""
+-						      "Too many metaserver redirects\n"));
++						      "Too many metaserver redirects.\n"));
+ 					return;
+ 				}
+ 				split_result = g_strsplit(line, " ", 0);
+@@ -648,7 +648,7 @@
+ 	if (metaserver_info.num_redirects > 0)
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Redirected to metaserver at %s, port %s\n"),
++			      "Redirected to the metaserver at %s, port %s.\n"),
+ 			    server, port);
+ 	show_waiting_box(_(""
+ 			   "Receiving a list of Pioneers servers from the metaserver.\n"),
+@@ -764,7 +764,7 @@
+ 
+ 	switch (arg1) {
+ 	case GTK_RESPONSE_OK:
+-		log_message(MSG_INFO, _("Requesting new game server\n"));
++		log_message(MSG_INFO, _("Requesting new game server.\n"));
+ 
+ 		cfg_terrain = game_rules_get_random_terrain(gr);
+ 		cfg_num_players = game_settings_get_players(gs);
+diff -u --label pioneers-14.1.orig/server/meta.c --label pioneers-14.1/server/meta.c 	     .pc/svn1860-2091_po.diff/server/meta.c server/meta.c
+Index: pioneers-14.1/server/meta.c
+===================================================================
+--- pioneers-14.1.orig/server/meta.c
++++ pioneers-14.1/server/meta.c
+@@ -117,7 +117,7 @@
+ 				if (num_redirects++ == 10) {
+ 					log_message(MSG_INFO,
+ 						    _(""
+-						      "Too many metaserver redirects\n"));
++						      "Too many metaserver redirects.\n"));
+ 					return;
+ 				}
+ 				split_result = g_strsplit(line, " ", 0);
+@@ -166,7 +166,7 @@
+ 		}
+ 		break;
+ 	case NET_CLOSE:
+-		log_message(MSG_ERROR, _("Metaserver kicked us off\n"));
++		log_message(MSG_ERROR, _("The metaserver closed the connection unexpectedly.\n"));
+ 		net_free(&ses);
+ 		break;
+ 	case NET_CONNECT:
+@@ -180,12 +180,12 @@
+ 	if (num_redirects > 0)
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Redirected to metaserver at %s, port %s\n"),
++			      "Redirected to the metaserver at %s, port %s.\n"),
+ 			    server, port);
+ 	else
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Register with metaserver at %s, port %s\n"),
++			      "Register with metaserver at %s, port %s.\n"),
+ 			    server, port);
+ 
+ 	if (ses != NULL)
+@@ -202,7 +202,7 @@
+ void meta_unregister(void)
+ {
+ 	if (ses != NULL) {
+-		log_message(MSG_INFO, _("Unregister from metaserver\n"));
++		log_message(MSG_INFO, _("Unregister from the metaserver.\n"));
+ 		net_free(&ses);
+ 	}
+ }
+diff -u --label pioneers-14.1.orig/server/main.c --label pioneers-14.1/server/main.c 	     .pc/svn1860-2091_po.diff/server/main.c server/main.c
+Index: pioneers-14.1/server/main.c
+===================================================================
+--- pioneers-14.1.orig/server/main.c
++++ pioneers-14.1/server/main.c
+@@ -272,7 +272,7 @@
+ 	if (admin_port != NULL) {
+ 		if (!admin_listen(admin_port)) {
+ 			/* Error message */
+-			g_print(_("Admin port not available.\n"));
++			g_print(_("The network port (%s) for the admin interface is not available.\n"), admin_port);
+ 			return 5;
+ 		}
+ 	}
+diff -u --label /dev/null --label pioneers-14.1/po/zh_CN.po 	     /dev/null po/zh_CN.po
+Index: pioneers-14.1/po/zh_CN.po
+===================================================================
+--- /dev/null
++++ pioneers-14.1/po/zh_CN.po
+@@ -0,0 +1,3703 @@
++# Chinese (Simplified) translation for pioneers
++# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
++# This file is distributed under the same license as the pioneers package.
++# Gerald <gera2ld@163.com>, 2014
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: Pioneers 15.1\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2014-12-20 21:39+0100\n"
++"PO-Revision-Date: 2012-01-12 13:22+0800\n"
++"Last-Translator: Gerald <gera2ld@163.com>\n"
++"Language-Team: Chinese (Simplified) <gera2ld@163.com>\n"
++"Language: zh_CN\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=1; plural=0\n"
++
++#. Commandline pioneersai: server
++#: ../client/ai/ai.c:70
++msgid "Server Host"
++msgstr "æ??å?¡å?¨å?°å??"
++
++#. Commandline pioneersai: port
++#: ../client/ai/ai.c:73
++msgid "Server Port"
++msgstr "æ??å?¡å?¨ç«¯å?£"
++
++#. Commandline pioneersai: name
++#: ../client/ai/ai.c:76
++msgid "Computer name (mandatory)"
++msgstr "è®¡ç®?æ?ºå??ï¼?å¿?é¡»ï¼?"
++
++#. Commandline pioneersai: time
++#: ../client/ai/ai.c:79
++msgid "Time to wait between turns (in milliseconds)"
++msgstr "å??å??é?´ç?å¾?æ?¶é?´ï¼?æ¯«ç§?ï¼?"
++
++#. Commandline pioneersai: chat-free
++#: ../client/ai/ai.c:82
++msgid "Stop computer player from talking"
++msgstr "ç¦?æ¢ç?µè??è¯´è¯?"
++
++#. Commandline pioneersai: algorithm
++#: ../client/ai/ai.c:85
++msgid "Type of computer player"
++msgstr "ç?µè??ç±»å??"
++
++#. Commandline option of ai: enable debug logging
++#. Commandline option of client: enable debug logging
++#. Commandline option of meta server: enable debug logging
++#. Commandline option of server-gtk: enable debug logging
++#. Commandline option of server: enable debug logging
++#: ../client/ai/ai.c:88 ../client/gtk/offline.c:68 ../meta-server/main.c:1090
++#: ../server/gtk/main.c:1130 ../server/main.c:145
++msgid "Enable debug messages"
++msgstr "å?¯ç?¨è°?è¯?ä¿¡æ?¯"
++
++#. Commandline option of ai: version
++#. Commandline option of client: version
++#. Commandline option of editor: version
++#. Commandline option of meta server: version
++#. Commandline option of server-gtk: version
++#. Commandline option of server-console: version
++#: ../client/ai/ai.c:91 ../client/gtk/offline.c:71 ../editor/gtk/editor.c:1419
++#: ../meta-server/main.c:1096 ../server/gtk/main.c:1133 ../server/main.c:100
++msgid "Show version information"
++msgstr "æ?¾ç¤ºç??æ?¬ä¿¡æ?¯"
++
++#. Long description in the commandline for pioneersai: help
++#: ../client/ai/ai.c:102
++msgid "- Computer player for Pioneers"
++msgstr "- ç?µè?? for Pioneers"
++
++#: ../client/ai/ai.c:114 ../client/gtk/offline.c:183
++#: ../editor/gtk/editor.c:1462 ../meta-server/main.c:1131
++#: ../server/gtk/main.c:1183 ../server/main.c:208
++#, c-format
++msgid "Pioneers version:"
++msgstr "Pioneers ç??æ?¬:"
++
++#. ai commandline error
++#: ../client/ai/ai.c:139
++#, c-format
++msgid "A name must be provided.\n"
++msgstr "å¿?é¡»æ??ä¾?ä¸?ä¸ªå??å?ã??\n"
++
++#: ../client/ai/ai.c:150
++#, c-format
++msgid "Type of computer player: %s\n"
++msgstr "ç?µè??ç±»å??: %s\n"
++
++#: ../client/ai/ai.c:181
++msgid "The game is already full. I'm leaving."
++msgstr "äººå·²ç»?æ»¡äº?ï¼?å?¥æ»?äº?ã??"
++
++#: ../client/ai/greedy.c:962
++msgid "No settlements in stock to use for setup"
++msgstr "æ?¿å?å·²ç»?ç?¨å®?äº?"
++
++#: ../client/ai/greedy.c:969
++msgid "There is no place to setup a settlement"
++msgstr "æ²¡æ??å?°æ?¹å»ºæ?¿å?äº?"
++
++#: ../client/ai/greedy.c:993
++msgid "No roads in stock to use for setup"
++msgstr "è·¯å·²ç»?ç?¨å®?äº?"
++
++#: ../client/ai/greedy.c:1010
++msgid "There is no place to setup a road"
++msgstr "æ²¡æ??å?°æ?¹ä¿®è·¯äº?"
++
++#. AI chat at the start of the turn
++#: ../client/ai/greedy.c:1311
++msgid "Ok, let's go!"
++msgstr "å¥½ç??ï¼?å¼?å§?å?§ï¼?"
++
++#. AI chat at the start of the turn
++#: ../client/ai/greedy.c:1313
++msgid "I'll beat you all now! ;)"
++msgstr "æ??å°?æ??è´¥ä½ ä»¬æ??æ??äººï¼?;)"
++
++#. AI chat at the start of the turn
++#: ../client/ai/greedy.c:1315
++msgid "Now for another try..."
++msgstr "å??æ?¥ä¸?æ¬¡â?¦â?¦"
++
++#. AI chat when one resource is received
++#: ../client/ai/greedy.c:1320
++msgid "At least I get something..."
++msgstr "è?³å°?è®©æ??å¾?ç?¹ä»?ä¹?å?§â?¦â?¦"
++
++#. AI chat when one resource is received
++#: ../client/ai/greedy.c:1322
++msgid "One is better than none..."
++msgstr "æ??æ?»æ¯?æ²¡æ??å¥½â?¦â?¦"
++
++#. AI chat when more than one resource is received
++#: ../client/ai/greedy.c:1327
++msgid "Wow!"
++msgstr "æ??äº?ä¸ªå?»ï¼?"
++
++#. AI chat when more than one resource is received
++#: ../client/ai/greedy.c:1329
++msgid "Ey, I'm becoming rich ;)"
++msgstr "å??ï¼?å?¥æ??é?±äº? ;)"
++
++#. AI chat when more than one resource is received
++#: ../client/ai/greedy.c:1331
++msgid "This is really a good year!"
++msgstr "ä»?å¹´ç??æ?¯å¥½æ°?è±¡å??ï¼?"
++
++#. AI chat when other players receive more than one resource
++#: ../client/ai/greedy.c:1336
++msgid "You really don't deserve that much!"
++msgstr "å??ï¼?å¥³äººä½?è?¦ä¸ºé?¾å¥³äººï¼?"
++
++#. AI chat when other players receive more than one resource
++#: ../client/ai/greedy.c:1338
++msgid "You don't know what to do with that many resources ;)"
++msgstr "ä½ æ?¿é?£ä¹?å¤?èµ?æº?å??ä¸?è?½å½?é¥å?? ;)"
++
++#. AI chat when other players receive more than one resource
++#: ../client/ai/greedy.c:1340
++msgid "Ey, wait for my robber and lose all this again!"
++msgstr "å?¿ï¼?ç»?å?¥ç?ç??ï¼?ç?ä¸?æ?¢å??ä½ ï¼?"
++
++#. AI chat when it moves the robber
++#: ../client/ai/greedy.c:1345
++msgid "Hehe!"
++msgstr "å?µå?µï¼?"
++
++#. AI chat when it moves the robber
++#: ../client/ai/greedy.c:1347
++msgid "Go, robber, go!"
++msgstr "å¼ºç??ï¼?å?»å?§ï¼?"
++
++#. AI chat when the robber is moved to it
++#: ../client/ai/greedy.c:1352
++msgid "You bastard!"
++msgstr "ä½ å¦¹å??ï¼?"
++
++#. AI chat when the robber is moved to it
++#: ../client/ai/greedy.c:1354
++msgid "Can't you move that robber somewhere else?!"
++msgstr "ä½ å°±ä¸?è?½æ?¢ä¸ªå?°æ?¹æ?¢ä¹?ï¼?ï¼?"
++
++#. AI chat when the robber is moved to it
++#: ../client/ai/greedy.c:1356
++msgid "Why always me??"
++msgstr "æ??ä¹?æ?»æ?¯æ??â?¦â?¦"
++
++#. AI chat when it must discard resources
++#: ../client/ai/greedy.c:1361
++msgid "Oh no!"
++msgstr "ä¸?è¦?å??~"
++
++#. AI chat when it must discard resources
++#: ../client/ai/greedy.c:1363
++msgid "Grrr!"
++msgstr "å??å??ï¼?"
++
++#. AI chat when it must discard resources
++#: ../client/ai/greedy.c:1365
++msgid "Who the hell rolled that 7??"
++msgstr "å?ªä¸ªæ··è??æ??ç??7ï¼?"
++
++#. AI chat when it must discard resources
++#: ../client/ai/greedy.c:1367
++msgid "Why always me?!?"
++msgstr "æ??ä¹?å??æ?¯æ??ï¼?ï¼?"
++
++#. AI chat when other players must discard
++#: ../client/ai/greedy.c:1372
++msgid "Say good bye to your cards... :)"
++msgstr "è·?ä½ ç??èµ?æº?è¯´å??è§?å?§â?¦â?¦ :)"
++
++#. AI chat when other players must discard
++#: ../client/ai/greedy.c:1374
++msgid "*evilgrin*"
++msgstr "*é?ªæ?¶å?°ç¬?*"
++
++#. AI chat when other players must discard
++#: ../client/ai/greedy.c:1376
++msgid "/me says farewell to your cards ;)"
++msgstr "/me å¯¹ä½ ç??èµ?æº?è¯´å??è§?å?§ ;)"
++
++#. AI chat when other players must discard
++#: ../client/ai/greedy.c:1378
++msgid "That's the price for being rich... :)"
++msgstr "å?ºæ?¥æ··ï¼?è¿?æ?©æ?¯è¦?è¿?ç??â?¦â?¦ :)"
++
++#. AI chat when someone steals from it
++#: ../client/ai/greedy.c:1383
++msgid "Ey! Where's that card gone?"
++msgstr "å?¦ï¼?é?£å¼ ç??å?¢ï¼?"
++
++#. AI chat when someone steals from it
++#: ../client/ai/greedy.c:1385
++msgid "Thieves! Thieves!!"
++msgstr "è´¼å??ï¼?è´¼ï¼?"
++
++#. AI chat when someone steals from it
++#: ../client/ai/greedy.c:1387
++msgid "Wait for my revenge..."
++msgstr "å?±ä»¬èµ°ç??ç?§â?¦â?¦"
++
++#. AI chat when someone plays the monopoly card
++#: ../client/ai/greedy.c:1392
++msgid "Oh no :("
++msgstr "æ??æ»´ç¥?é¢? :("
++
++#. AI chat when someone plays the monopoly card
++#: ../client/ai/greedy.c:1394
++msgid "Must this happen NOW??"
++msgstr "ä¸?å®?è¦?å?¨è¿?ä¸ªæ?¶å??æ?¥å??ï¼?"
++
++#. AI chat when someone plays the monopoly card
++#: ../client/ai/greedy.c:1396
++msgid "Args"
++msgstr "å??å?¢"
++
++#. AI chat when it has the largest army
++#: ../client/ai/greedy.c:1401
++msgid "Hehe, my soldiers rule!"
++msgstr "å?µå?µï¼?å?¥ç??æ??å£«æ??NBï¼?"
++
++#. AI chat when another player that the largest army
++#: ../client/ai/greedy.c:1406
++msgid "First robbing us, then grabbing the points..."
++msgstr "æ?¢äº?æ??ä»¬è¿?å¾?äº?å??ï¼?ä»?ç?½å¤§äº?â?¦â?¦"
++
++#. AI chat when it has the longest road
++#: ../client/ai/greedy.c:1411
++msgid "See that road!"
++msgstr "ç??é?£æ?¡è·¯ï¼?"
++
++#. AI chat when another player has the longest road
++#: ../client/ai/greedy.c:1416
++msgid "Pf, you won't win with roads alone..."
++msgstr "å??ï¼?ä½ æ??æ??é?¿è·¯ä¹?ä¸?ä¸?å®?å°±è?½èµ¢â?¦â?¦"
++
++#: ../client/ai/greedy.c:1903
++msgid "Rejecting trade.\n"
++msgstr "æ??ç»?äº¤æ??ã??\n"
++
++#: ../client/ai/greedy.c:2002
++#, c-format
++msgid "Received error from server: %s.  Quitting\n"
++msgstr "ä»?æ??å?¡å?¨æ?¶å?°é??è¯¯: %s.  é??å?º\n"
++
++#. AI chat when it wins
++#: ../client/ai/greedy.c:2014
++msgid "Yippie!"
++msgstr "å??è?¶ï¼?"
++
++#. AI chat when another player wins
++#: ../client/ai/greedy.c:2017
++msgid "My congratulations"
++msgstr "æ?å??ä½ "
++
++#. Translators: don't translate '/help'
++#: ../client/ai/lobbybot.c:80
++msgid ""
++"Hello, welcome to the lobby. I am a simple robot. Type '/help' in the chat "
++"to see the list of commands I know."
++msgstr ""
++"ä½ å¥½ï¼?æ¬¢è¿?æ?¥å?°å¤§å??ã??æ??æ?¯æ?ºå?¨äººã??å?¨è??å¤©å¤?è¾?å?¥'/help'å°±è?½ç??å?°æ??æ?¯æ??ç??å?½ä»¤ã??"
++
++#. Translators: don't translate '/help'
++#: ../client/ai/lobbybot.c:107
++msgid "'/help' shows this message again"
++msgstr "'/help' å??æ¬¡æ?¾ç¤ºæ¤ä¿¡æ?¯"
++
++#. Translators: don't translate '/why'
++#: ../client/ai/lobbybot.c:110
++msgid "'/why' explains the purpose of this strange board layout"
++msgstr "'/why' è§£é??è¿?ä¸ªå¥?æ?ªç??ç??é?¢ç??ç?®ç??"
++
++#. Translators: don't translate '/news'
++#: ../client/ai/lobbybot.c:113
++msgid "'/news' tells the last released version"
++msgstr "'/news' æ?¾ç¤ºæ??æ?°ç??æ?¬å?·"
++
++#. AI chat that explains '/why'
++#: ../client/ai/lobbybot.c:119
++msgid ""
++"This board is not intended to be a game that can be played. Instead, players "
++"can find eachother here, and decide which board they want to play. Then, one "
++"of the players will host the proposed game by starting a server, and "
++"registers it at the metaserver. The other players can subsequently "
++"disconnect from the lobby, and enter that game."
++msgstr ""
++"è¿?ä¸?æ?¯æ¸¸æ??ç??é?¢ï¼?å?¨è¿?ä¸ªç??é?¢ä¸?ï¼?ç?©å®¶å?¯ä»¥ç??å?°å½¼æ¤å¹¶é??æ?©ä¸?ä¸ªæ?¿é?´è¿?è¡?æ¸¸æ??ã??ç?¶å??ï¼?"
++"å?¶ä¸ä¸?ä¸ªç?©å®¶å°?å?¯å?¨ä¸?ä¸ªæ??å?¡å?¨å¼?å§?ä¸?å?ºæ¸¸æ??ï¼?å¹¶æ??å®?æ³¨å??å?°ä¸è½¬æ??å?¡å?¨ã??ç?¶å??å?¶ä»?ç?©"
++"å®¶å°±ä¼?ä»?å¤§å??æ?å¼?ï¼?å¹¶è¿?å?¥è¿?å?ºæ¸¸æ??ã??"
++
++#: ../client/ai/lobbybot.c:130
++msgid "The last released version of Pioneers is"
++msgstr "æ??æ?°ç??ç??Pioneersæ?¯"
++
++#. The lobbybot leaves when a game is starting
++#: ../client/ai/lobbybot.c:146
++msgid "The game is starting. I'm not needed anymore. Goodbye."
++msgstr "æ¸¸æ??å¼?å§?ï¼?å?¥ç??ä»»å?¡å®?æ??äº?ï¼?å?¥èµ°äº?ã??"
++
++#: ../client/common/client.c:106
++msgid "Waiting"
++msgstr "ç?å¾?ä¸"
++
++#: ../client/common/client.c:108
++msgid "Idle"
++msgstr "é?²é??"
++
++#: ../client/common/client.c:533
++msgid "We have been kicked out of the game.\n"
++msgstr "æ??ä»¬è¢«è¸¢å?ºæ?¥äº?ã??\n"
++
++#. Network status: offline
++#: ../client/common/client.c:536 ../client/common/client.c:982
++#: ../client/gtk/gui.c:1553
++msgid "Offline"
++msgstr "ç¦»çº¿"
++
++#: ../client/common/client.c:557
++#, c-format
++msgid "Error (%s): %s\n"
++msgstr "é??è¯¯ (%s): %s\n"
++
++#: ../client/common/client.c:566 ../client/common/client.c:577
++#, c-format
++msgid "Notice: %s\n"
++msgstr "æ³¨æ??: %s\n"
++
++#: ../client/common/client.c:692
++#, c-format
++msgid "%s does not receive any %s, because the bank is empty.\n"
++msgstr "%s æ²¡æ??å¾?å?°ä»»ä½? %sï¼?å? ä¸ºé?¶è¡?æ²¡é?±äº?ã??\n"
++
++#: ../client/common/client.c:705
++#, c-format
++msgid "%s only receives %s, because the bank didn't have any more.\n"
++msgstr "%s å?ªå¾?å?°äº? %sï¼?å? ä¸ºé?¶è¡?ä¹?å?ªå?©è¿?ä¹?ç?¹å?¿äº?ã??\n"
++
++#: ../client/common/client.c:715
++#, c-format
++msgid "%s receives %s.\n"
++msgstr "%s å¾?å?°äº? %sã??\n"
++
++#. Year of Plenty
++#: ../client/common/client.c:723 ../client/common/client.c:2659
++#, c-format
++msgid "%s takes %s.\n"
++msgstr "%s æ?¿äº? %sã??\n"
++
++#: ../client/common/client.c:728
++#, c-format
++msgid "%s spent %s.\n"
++msgstr "%s è?±äº? %sã??\n"
++
++#: ../client/common/client.c:734
++#, c-format
++msgid "%s is refunded %s.\n"
++msgstr "%s è¢«é??è¿?äº? %sã??\n"
++
++#: ../client/common/client.c:765
++#, c-format
++msgid "%s discarded %s.\n"
++msgstr "%s ä¸¢å¼?äº? %sã??\n"
++
++#: ../client/common/client.c:839
++#, c-format
++msgid "%s has won the game with %d victory points!\n"
++msgstr "%s å¾?äº? %d ä¸ªè??å?©ç?¹ï¼?èµ¢å¾?äº?æ¸¸æ??ç??è??å?©ï¼?\n"
++
++#: ../client/common/client.c:938
++msgid "Loading"
++msgstr "å? è½½ä¸"
++
++#: ../client/common/client.c:983
++msgid "Version mismatch."
++msgstr "ç??æ?¬ä¸?å?¹é??ã??"
++
++#: ../client/common/client.c:985
++msgid "Version mismatch. Please make sure client and server are up to date.\n"
++msgstr "ç??æ?¬ä¸?å?¹é??ï¼?è¯·ç¡®ä¿?å®¢æ?·ç«¯å??æ??å?¡ç«¯æ?¯æ??æ?°ç??ã??\n"
++
++#: ../client/common/client.c:1410
++msgid "Build two settlements, each with a connecting"
++msgstr "å»ºä¸¤ä¸ªæ?¿å?ï¼?å??å?«è¿?æ?¥ç??"
++
++#: ../client/common/client.c:1413
++msgid "Build a settlement with a connecting"
++msgstr "å»ºä¸?ä¸ªæ?¿å?ï¼?è¿?æ?¥ç??"
++
++#: ../client/common/client.c:1416
++msgid "road"
++msgstr "ä¸?æ?¡è·¯"
++
++#: ../client/common/client.c:1418
++msgid "bridge"
++msgstr "ä¸?åº§æ¡¥"
++
++#: ../client/common/client.c:1420
++msgid "ship"
++msgstr "ä¸?è??è?¹"
++
++#: ../client/common/client.c:1427
++msgid " or"
++msgstr "æ??è??"
++
++#: ../client/common/client.c:1491
++msgid "Waiting for your turn."
++msgstr "è¿?æ²¡å?°ä½ ï¼?ä½ å??ç?ç??ã??"
++
++#: ../client/common/client.c:1543 ../client/gtk/interface.c:758
++msgid "Select the building to steal from."
++msgstr "é??æ?©è¦?å?·ç??å»ºç?ã??"
++
++#: ../client/common/client.c:1565 ../client/gtk/interface.c:748
++msgid "Select the ship to steal from."
++msgstr "é??æ?©è¦?å?·ç??è?¹ã??"
++
++#: ../client/common/client.c:1649 ../client/gtk/interface.c:790
++msgid "Place the robber."
++msgstr "æ?¾ç½®å¼ºç??ã??"
++
++#: ../client/common/client.c:1699
++msgid "Finish the road building action."
++msgstr "å®?æ??ä¿®è·¯è¡?ä¸ºã??"
++
++#: ../client/common/client.c:1701
++msgid "Build one road segment."
++msgstr "ä¿®ä¸?æ®µè·¯ã??"
++
++#: ../client/common/client.c:1703
++msgid "Build two road segments."
++msgstr "ä¿®ä¸¤æ®µè·¯ã??"
++
++#. Notification
++#: ../client/common/client.c:1976 ../client/common/client.c:2070
++#: ../client/gtk/interface.c:416
++msgid "It is your turn."
++msgstr "å?°ä½ äº?ã??"
++
++#: ../client/common/client.c:2164
++#, c-format
++msgid "Sorry, %s available.\n"
++msgstr "æ?±æ?ï¼?%s è¿?å?¨ã??\n"
++
++#: ../client/common/client.c:2478
++msgid "The game is over."
++msgstr "æ¸¸æ??ç»?æ??ã??"
++
++#. This development card is unique
++#: ../client/common/develop.c:66
++#, c-format
++msgid "You bought the %s development card.\n"
++msgstr "ä½ ä¹°äº? %s å??å±?å?¡ã??\n"
++
++#. This development card is not unique
++#: ../client/common/develop.c:72
++#, c-format
++msgid "You bought a %s development card.\n"
++msgstr "ä½ ä¹°äº?ä¸?å¼  %s å??å±?å?¡ã??\n"
++
++#: ../client/common/develop.c:95
++#, c-format
++msgid "%s bought a development card.\n"
++msgstr "%s ä¹°äº?ä¸?å¼ å??å±?å?¡ã??\n"
++
++#: ../client/common/develop.c:114
++#, c-format
++msgid "%s played the %s development card.\n"
++msgstr "%s ä½¿ç?¨äº? %s å??å±?å?¡ã??\n"
++
++#: ../client/common/develop.c:119
++#, c-format
++msgid "%s played a %s development card.\n"
++msgstr "%s ä½¿ç?¨äº?ä¸?å¼  %s å??å±?å?¡ã??\n"
++
++#: ../client/common/develop.c:131
++msgid "You have run out of road segments.\n"
++msgstr "ä½ ç??è·¯ç?¨å®?äº?ã??\n"
++
++#. I get the cards
++#. $1=resources, $2=player that loses resources
++#: ../client/common/develop.c:172
++#, c-format
++msgid "You get %s from %s.\n"
++msgstr "ä½ ä»? %2$s å¾?å?°äº? %1$s ã??\n"
++
++#. I lose the cards
++#. $1=player that steals, $2=resources
++#: ../client/common/develop.c:178
++#, c-format
++msgid "%s took %s from you.\n"
++msgstr "%s ä»?ä½ è¿?æ?¿èµ°äº? %s ã??\n"
++
++#: ../client/common/develop.c:185
++#, c-format
++msgid "%s took %s from %s.\n"
++msgstr "%1$s æ?¿èµ°äº? %3$s ç?? %2$sã??\n"
++
++#: ../client/common/player.c:124 ../server/player.c:561
++#, c-format
++msgid "Spectator %d"
++msgstr "è§?ä¼? %d"
++
++#: ../client/common/player.c:127
++#, c-format
++msgid "spectator %d"
++msgstr "è§?ä¼? %d"
++
++#: ../client/common/player.c:136 ../server/player.c:564
++#, c-format
++msgid "Player %d"
++msgstr "ç?©å®¶ %d"
++
++#: ../client/common/player.c:138
++#, c-format
++msgid "player %d"
++msgstr "ç?©å®¶ %d"
++
++#: ../client/common/player.c:214
++#, c-format
++msgid "New spectator: %s.\n"
++msgstr "æ?°è§?ä¼?: %sã??\n"
++
++#: ../client/common/player.c:217 ../client/common/player.c:233
++#, c-format
++msgid "%s is now %s.\n"
++msgstr "%s ç?°å?¨å?« %sã??\n"
++
++#: ../client/common/player.c:230
++#, c-format
++msgid "Player %d is now %s.\n"
++msgstr "ç?©å®¶ %d ç?°å?¨æ?¯ %sã??\n"
++
++#: ../client/common/player.c:267
++#, c-format
++msgid "%s has quit.\n"
++msgstr "%s é??å?ºäº?ã??\n"
++
++#: ../client/common/player.c:276
++msgid "There is no largest army.\n"
++msgstr "æ²¡æ??æ??å¤§å??é??ã??\n"
++
++#: ../client/common/player.c:279
++#, c-format
++msgid "%s has the largest army.\n"
++msgstr "%s æ??æ??å¤§å??é??ã??\n"
++
++#: ../client/common/player.c:300
++msgid "There is no longest road.\n"
++msgstr "æ²¡æ??æ??é?¿è·¯ã??\n"
++
++#: ../client/common/player.c:303
++#, c-format
++msgid "%s has the longest road.\n"
++msgstr "%s æ??æ??é?¿è·¯ã??\n"
++
++#: ../client/common/player.c:324
++#, c-format
++msgid "Waiting for %s."
++msgstr "ç?å¾? %s."
++
++#. We are not in on the action
++#. someone stole a resource from someone else
++#: ../client/common/player.c:352
++#, c-format
++msgid "%s stole a resource from %s.\n"
++msgstr "%s å?·äº? %s ç??ä¸?ä¸ªèµ?æº?ã??\n"
++
++#. $1=resource, $2=player name
++#: ../client/common/player.c:363
++#, c-format
++msgid "You stole %s from %s.\n"
++msgstr "ä½ ä»? %2$s å?·äº? %1$s ã??\n"
++
++#. $1=player name, $2=resource
++#: ../client/common/player.c:370
++#, c-format
++msgid "%s stole %s from you.\n"
++msgstr "%s ä»?ä½ è¿?å?·èµ°äº? %s ã??\n"
++
++#: ../client/common/player.c:404
++#, c-format
++msgid "%s gave %s nothing!?\n"
++msgstr "%s ä»?ä¹?é?½æ²¡ç»? %s ï¼?ï¼?\n"
++
++#. $1=giving player, $2=receiving player, $3=resources
++#: ../client/common/player.c:411 ../client/common/player.c:421
++#, c-format
++msgid "%s gave %s %s for free.\n"
++msgstr "%s å??è´¹ç»?äº? %s %s ã??\n"
++
++#: ../client/common/player.c:429
++#, c-format
++msgid "%s gave %s %s in exchange for %s.\n"
++msgstr "%s ç»?äº? %s %s æ?¥äº¤æ?¢ %sã??\n"
++
++#: ../client/common/player.c:460
++#, c-format
++msgid "%s exchanged %s for %s.\n"
++msgstr "%s ç?¨ %s æ?¢äº? %sã??\n"
++
++#: ../client/common/player.c:480
++#, c-format
++msgid "%s built a road.\n"
++msgstr "%s ä¿®äº?ä¸?æ?¡è·¯ã??\n"
++
++#: ../client/common/player.c:492
++#, c-format
++msgid "%s built a ship.\n"
++msgstr "%s é? äº?ä¸?æ?¡è?¹ã??\n"
++
++#: ../client/common/player.c:505
++#, c-format
++msgid "%s built a settlement.\n"
++msgstr "%s å»ºäº?ä¸?ä¸ªæ?¿å?ã??\n"
++
++#: ../client/common/player.c:524
++#, c-format
++msgid "%s built a city.\n"
++msgstr "%s å»ºäº?ä¸?ä¸ªå??å¸?ã??\n"
++
++#: ../client/common/player.c:538
++#, c-format
++msgid "%s built a city wall.\n"
++msgstr "%s å»ºäº?ä¸?å µå??å¢?ã??\n"
++
++#. Error message
++#: ../client/common/player.c:549
++#, c-format
++msgid "player_build_add called with BUILD_NONE for user %s\n"
++msgstr "player_build_add called with BUILD_NONE for user %s\n"
++
++#: ../client/common/player.c:559
++#, c-format
++msgid "%s built a bridge.\n"
++msgstr "%s ä¿®äº?ä¸?åº§æ¡¥ã??\n"
++
++#: ../client/common/player.c:585
++#, c-format
++msgid "%s removed a road.\n"
++msgstr "%s æ¯?äº?ä¸?æ?¡è·¯ã??\n"
++
++#: ../client/common/player.c:595
++#, c-format
++msgid "%s removed a ship.\n"
++msgstr "%s æ¯?äº?ä¸?æ?¡è?¹ã??\n"
++
++#: ../client/common/player.c:605
++#, c-format
++msgid "%s removed a settlement.\n"
++msgstr "%s æ¯?äº?ä¸?ä¸ªæ?¿å?ã??\n"
++
++#: ../client/common/player.c:616
++#, c-format
++msgid "%s removed a city.\n"
++msgstr "%s æ¯?äº?ä¸?ä¸ªå??å¸?ã??\n"
++
++#: ../client/common/player.c:630
++#, c-format
++msgid "%s removed a city wall.\n"
++msgstr "%s æ¯?äº?ä¸?å µå??å¢?ã??\n"
++
++#. Error message
++#: ../client/common/player.c:640
++#, c-format
++msgid "player_build_remove called with BUILD_NONE for user %s\n"
++msgstr "player_build_remove called with BUILD_NONE for user %s\n"
++
++#: ../client/common/player.c:649
++#, c-format
++msgid "%s removed a bridge.\n"
++msgstr "%s æ¯?äº?ä¸?åº§æ¡¥ã??\n"
++
++#: ../client/common/player.c:680
++#, c-format
++msgid "%s has canceled a ship's movement.\n"
++msgstr "%s å??æ¶?äº?ä¸?è??è?¹ç??ç§»å?¨ã??\n"
++
++#: ../client/common/player.c:683
++#, c-format
++msgid "%s moved a ship.\n"
++msgstr "%s ç§»å?¨äº?ä¸?è??è?¹ã??\n"
++
++#. tell the user that someone got something
++#: ../client/common/player.c:703
++#, c-format
++msgid "%s received %s.\n"
++msgstr "%s æ?¶å?°äº? %sã??\n"
++
++#: ../client/common/player.c:722
++msgid "server asks to lose invalid point.\n"
++msgstr "æ??å?¡å?¨è¦?æ±?æ??å¼?ä¸?å??æ³?ç??å¾?å??ã??\n"
++
++#. tell the user the point is lost
++#: ../client/common/player.c:728
++#, c-format
++msgid "%s lost %s.\n"
++msgstr "%s ä¸¢å¤± %sã??\n"
++
++#: ../client/common/player.c:751
++msgid "server asks to move invalid point.\n"
++msgstr "server asks to move invalid point.\n"
++
++#. tell the user someone (1) lost something (2) to someone else (3)
++#: ../client/common/player.c:758
++#, c-format
++msgid "%s lost %s to %s.\n"
++msgstr "%s å¤±å?»äº? %s ç»?äº? %sã??\n"
++
++#: ../client/common/resource.c:35
++msgid "brick"
++msgstr "ç ?å¤´"
++
++#: ../client/common/resource.c:35
++msgid "Brick"
++msgstr "ç ?å¤´"
++
++#: ../client/common/resource.c:36
++msgid "grain"
++msgstr "éº¦å?"
++
++#: ../client/common/resource.c:36
++msgid "Grain"
++msgstr "éº¦å?"
++
++#: ../client/common/resource.c:37
++msgid "ore"
++msgstr "ç?¿ç?³"
++
++#: ../client/common/resource.c:37
++msgid "Ore"
++msgstr "ç?¿ç?³"
++
++#: ../client/common/resource.c:38
++msgid "wool"
++msgstr "ç¾?æ¯?"
++
++#: ../client/common/resource.c:38
++msgid "Wool"
++msgstr "ç¾?æ¯?"
++
++#: ../client/common/resource.c:39
++msgid "lumber"
++msgstr "å??æ?¨"
++
++#: ../client/common/resource.c:39
++msgid "Lumber"
++msgstr "å??æ?¨"
++
++#: ../client/common/resource.c:40
++msgid "no resource (bug)"
++msgstr "æ²¡æ??èµ?æº? (bug)"
++
++#: ../client/common/resource.c:40
++msgid "No resource (bug)"
++msgstr "æ²¡æ??èµ?æº? (bug)"
++
++#: ../client/common/resource.c:41
++msgid "any resource (bug)"
++msgstr "ä»»ä½?èµ?æº? (bug)"
++
++#: ../client/common/resource.c:41
++msgid "Any resource (bug)"
++msgstr "ä»»ä½?èµ?æº? (bug)"
++
++#: ../client/common/resource.c:42
++msgid "gold"
++msgstr "é»?é??"
++
++#: ../client/common/resource.c:42 ../client/gtk/legend.c:40
++msgid "Gold"
++msgstr "é»?é??"
++
++#: ../client/common/resource.c:47
++msgid "a brick card"
++msgstr "ä¸?å??ç ?å¤´"
++
++#: ../client/common/resource.c:47
++#, c-format
++msgid "%d brick cards"
++msgstr "%d å??ç ?å¤´"
++
++#: ../client/common/resource.c:48
++msgid "a grain card"
++msgstr "ä¸?ä¸ªéº¦å?"
++
++#: ../client/common/resource.c:48
++#, c-format
++msgid "%d grain cards"
++msgstr "%d ä¸ªéº¦å?"
++
++#: ../client/common/resource.c:49
++msgid "an ore card"
++msgstr "ä¸?å??ç?¿ç?³"
++
++#: ../client/common/resource.c:49
++#, c-format
++msgid "%d ore cards"
++msgstr "%d å??ç?¿ç?³"
++
++#: ../client/common/resource.c:50
++msgid "a wool card"
++msgstr "ä¸?å?¨ç¾?æ¯?"
++
++#: ../client/common/resource.c:50
++#, c-format
++msgid "%d wool cards"
++msgstr "%d å?¨ç¾?æ¯?"
++
++#: ../client/common/resource.c:51
++msgid "a lumber card"
++msgstr "ä¸?æ ¹å??æ?¨"
++
++#: ../client/common/resource.c:51
++#, c-format
++msgid "%d lumber cards"
++msgstr "%d æ ¹å??æ?¨"
++
++#: ../client/common/resource.c:139 ../client/common/resource.c:225
++msgid "nothing"
++msgstr "ä¸?ä¸ªå±?"
++
++#. Construct "A, B and C" for resources
++#: ../client/common/resource.c:166
++#, c-format
++msgid "%s and %s"
++msgstr "%s å?? %s"
++
++#. Construct "A, B and C" for resources
++#: ../client/common/resource.c:170
++#, c-format
++msgid "%s, %s"
++msgstr "%sï¼?%s"
++
++#: ../client/common/robber.c:62
++#, c-format
++msgid "%s has undone the robber movement.\n"
++msgstr "%s æ?¤æ¶?äº?ç§»å?¨å¼ºç??ã??\n"
++
++#: ../client/common/robber.c:65
++#, c-format
++msgid "%s moved the robber.\n"
++msgstr "%s ç§»å?¨äº?å¼ºç??ã??\n"
++
++#: ../client/common/robber.c:75
++#, c-format
++msgid "%s has undone the pirate movement.\n"
++msgstr "%s æ?¤æ¶?äº?ç§»å?¨æµ·ç??ã??\n"
++
++#: ../client/common/robber.c:78
++#, c-format
++msgid "%s moved the pirate.\n"
++msgstr "%s ç§»å?¨äº?æµ·ç??ã??\n"
++
++#: ../client/common/robber.c:85
++#, c-format
++msgid "%s must move the robber."
++msgstr "%s å¿?é¡»ç§»å?¨å¼ºç??ã??"
++
++#: ../client/common/setup.c:146
++#, c-format
++msgid "Setup for %s.\n"
++msgstr "%s æ??èµ·æ?¥ã??\n"
++
++#: ../client/common/setup.c:158
++#, c-format
++msgid "Double setup for %s.\n"
++msgstr "%s æ??ä¸¤æ¬¡ã??\n"
++
++#: ../client/common/turn.c:37
++#, c-format
++msgid "%s rolled %d.\n"
++msgstr "%s æ??å?ºäº?ä¸ª %d.\n"
++
++#: ../client/common/turn.c:50
++#, c-format
++msgid "Begin turn %d for %s.\n"
++msgstr "å¼?å§? %2$s ç??ç¬¬ %1$d å??å??ã??\n"
++
++#: ../client/gtk/avahi-browser.c:83
++msgid "Select an automatically discovered game"
++msgstr "é??æ?©ä¸?ä¸ªè?ªå?¨å??ç?°ç??æ¸¸æ??"
++
++#. $1=Game title, $2=version, $3=host_name, $4=port
++#: ../client/gtk/avahi-browser.c:132
++#, c-format
++msgid "%s (%s) on %s:%s"
++msgstr "%s (%s) @ %s:%s"
++
++#. Label text
++#: ../client/gtk/chat.c:73
++msgid "<b>Chat</b>"
++msgstr "<b>è??å¤©</b>"
++
++#: ../client/gtk/chat.c:233
++msgid "Beeper test.\n"
++msgstr "æµ?è¯?ä¸?ä¸?æ?¬å£°å?¨ã??\n"
++
++#: ../client/gtk/chat.c:236
++#, c-format
++msgid "%s beeped you.\n"
++msgstr "%s å¯¹ä½ æ??äº?ä¸ªæ??å?¼ã??\n"
++
++#: ../client/gtk/chat.c:240
++#, c-format
++msgid "You beeped %s.\n"
++msgstr "ä½ å¯¹ %s æ??äº?ä¸ªæ??å?¼ã??\n"
++
++#: ../client/gtk/chat.c:246
++#, c-format
++msgid "You could not beep %s.\n"
++msgstr "ä½ ä¸?è?½å¯¹ %s æ??æ??å?¼ã??\n"
++
++#: ../client/gtk/chat.c:290
++msgid " said: "
++msgstr " è¯´: "
++
++#: ../client/gtk/connect.c:277
++#, c-format
++msgid "Metaserver at %s, port %s"
++msgstr "ä¸è½¬æ??å?¡å?¨ @ %s:%s"
++
++#: ../client/gtk/connect.c:287
++msgid "Finished.\n"
++msgstr "å®?æ??ã??\n"
++
++#: ../client/gtk/connect.c:304 ../client/gtk/connect.c:354
++#: ../client/gtk/connect.c:454 ../server/meta.c:169
++msgid "The metaserver closed the connection unexpectedly.\n"
++msgstr "ä¸è½¬æ??å?¡å?¨æ??å¤?å?³é?è¿?æ?¥ã??\n"
++
++#: ../client/gtk/connect.c:329
++msgid "Receiving game names from the metaserver.\n"
++msgstr "ä»?ä¸è½¬æ??å?¡å?¨è?·å??æ¸¸æ??å??ç§°ã??\n"
++
++#: ../client/gtk/connect.c:376
++#, c-format
++msgid "New game server requested on %s port %s.\n"
++msgstr "å?¨ %s:%s è¯·æ±?äº?å»ºç«?æ?°æ¸¸æ??ã??\n"
++
++#: ../client/gtk/connect.c:385 ../server/meta.c:162
++#, c-format
++msgid "Unknown message from the metaserver: %s\n"
++msgstr "ä»?ä¸è½¬æ??å?¡å?¨æ?¶å?°æ?ªç?¥ä¿¡æ?¯: %s\n"
++
++#: ../client/gtk/connect.c:469 ../server/meta.c:119
++msgid "Too many metaserver redirects.\n"
++msgstr "ä¸è½¬æ??å?¡å?¨é??ç½®ä¿¡æ?¯å¤ªå¤?ã??\n"
++
++#: ../client/gtk/connect.c:496 ../server/meta.c:134
++#, c-format
++msgid "Bad redirect line: %s\n"
++msgstr "é??è¯¯ç??é??ç½®ä¿¡æ?¯: %s\n"
++
++#: ../client/gtk/connect.c:522
++#, c-format
++msgid "The metaserver is too old to create servers (version %d.%d)\n"
++msgstr "ä¸è½¬æ??å?¡å?¨å¤ªæ?§ï¼?æ? æ³?å??å»ºæ??å?¡ (ç??æ?¬å?· %d.%d)\n"
++
++#. Sevens rule: normal
++#: ../client/gtk/connect.c:594 ../client/gtk/settingscreen.c:181
++#: ../common/gtk/game-rules.c:79
++msgid "Normal"
++msgstr "æ£å¸¸"
++
++#. Sevens rule: reroll on 1st 2 turns
++#: ../client/gtk/connect.c:599 ../client/gtk/settingscreen.c:183
++#: ../common/gtk/game-rules.c:85
++msgid "Reroll on 1st 2 turns"
++msgstr "å??2å??å??é??æ??"
++
++#. Sevens rule: reroll all 7s
++#: ../client/gtk/connect.c:603 ../client/gtk/settingscreen.c:185
++#: ../common/gtk/game-rules.c:92
++msgid "Reroll all 7s"
++msgstr "é??æ??æ??æ??ç??7"
++
++#: ../client/gtk/connect.c:617
++msgid "Default"
++msgstr "é»?è®¤"
++
++#: ../client/gtk/connect.c:620
++msgid "Random"
++msgstr "é??æ?º"
++
++#: ../client/gtk/connect.c:650 ../server/meta.c:182
++#, c-format
++msgid "Redirected to the metaserver at %s, port %s.\n"
++msgstr "ä»?ä¸è½¬æ??å?¡å?¨è?·å??æ¸¸æ??æ??å?¡å?¨å??è¡¨ã??\n"
++
++#: ../client/gtk/connect.c:653
++msgid "Receiving a list of Pioneers servers from the metaserver.\n"
++msgstr "æ£å?¨ä»?ä¸è½¬æ??å?¡å?¨è?·å??Pioneersæ??å?¡å?¨å??è¡¨ã??\n"
++
++#: ../client/gtk/connect.c:708
++msgid ""
++"<b>Note</b>:\n"
++"\tThe metaserver does not send information about the games.\n"
++"\tPlease set appropriate values yourself."
++msgstr ""
++"<b>Note</b>:\n"
++"\tThe metaserver does not send information about the games.\n"
++"\tPlease set appropriate values yourself."
++
++#. Label
++#: ../client/gtk/connect.c:726
++msgid "Number of computer players"
++msgstr "ç?µè??ç?©å®¶æ?°ç?®"
++
++#. Tooltip
++#: ../client/gtk/connect.c:746
++msgid "The number of computer players"
++msgstr "ç?µè??ç?©å®¶æ?°ç?®"
++
++#: ../client/gtk/connect.c:767
++msgid "Requesting new game server.\n"
++msgstr "æ£å?¨è¯·æ±?å??å»ºæ?°æ¸¸æ??ã??\n"
++
++#: ../client/gtk/connect.c:810 ../server/gtk/main.c:350 ../server/server.c:153
++#, c-format
++msgid "Error starting %s: %s\n"
++msgstr "å?¯å?¨é??è¯¯ %s: %s\n"
++
++#. Dialog caption
++#: ../client/gtk/connect.c:832
++msgid "Create a Public Game"
++msgstr "å??å»ºä¸?ä¸ªå?¬å?±ç??æ¸¸æ??"
++
++#. Dialog caption
++#: ../client/gtk/connect.c:955
++msgid "Join a Public Game"
++msgstr "å? å?¥å?¬å?±æ¸¸æ??"
++
++#. Button text
++#: ../client/gtk/connect.c:961
++msgid "_New Remote Game"
++msgstr "æ?°å»ºè¿?ç¨?æ¸¸æ??(_N)"
++
++#. Tooltip
++#: ../client/gtk/connect.c:975
++msgid "Refresh the list of games"
++msgstr "å?·æ?°æ¸¸æ??å??è¡¨"
++
++#. Tooltip
++#: ../client/gtk/connect.c:979
++msgid "Create a new public game at the metaserver"
++msgstr "å?¨ä¸è½¬æ??å?¡å?¨å??å»ºä¸?ä¸ªæ?°ç??å?¬å¼?æ¸¸æ??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:984
++msgid "Don't join a public game"
++msgstr "ä¸?å? å?¥å?¬å¼?æ¸¸æ??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:988
++msgid "Join the selected game"
++msgstr "å? å?¥æ??é??ç??æ¸¸æ??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1025
++msgid "Select a game to join"
++msgstr "é??æ?©å? å?¥ä¸?ä¸ªæ¸¸æ??"
++
++#. Column name
++#: ../client/gtk/connect.c:1029
++msgid "Map Name"
++msgstr "å?°å?¾å??ç§°"
++
++#. Tooltip for column 'Map Name'
++#: ../client/gtk/connect.c:1037
++msgid "Name of the game"
++msgstr "æ¸¸æ??å??ç§°"
++
++#. Column name
++#: ../client/gtk/connect.c:1043
++msgid "Curr"
++msgstr "å½?å??ç?©å®¶æ?°ç?®"
++
++#. Tooltip for column 'Curr'
++#: ../client/gtk/connect.c:1050
++msgid "Number of players in the game"
++msgstr "æ¸¸æ??ä¸ç??ç?©å®¶æ?°ç?®"
++
++#. Column name
++#: ../client/gtk/connect.c:1056
++msgid "Max"
++msgstr "æ??å¤§ç?©å®¶æ?°ç?®"
++
++#. Tooltip for column 'Max'
++#: ../client/gtk/connect.c:1063
++msgid "Maximum players for the game"
++msgstr "æ??å¤§ç?©å®¶æ?°ç?®"
++
++#. Column name
++#: ../client/gtk/connect.c:1067
++msgid "Terrain"
++msgstr "å?°å½¢"
++
++#. Tooltip for column 'Terrain'
++#: ../client/gtk/connect.c:1075
++msgid "Random of default terrain"
++msgstr "é??æ?ºé»?è®¤å?°å½¢"
++
++#. Column name
++#: ../client/gtk/connect.c:1081
++msgid "Vic. Points"
++msgstr "è??å?©ç?¹æ?°"
++
++#. Tooltip for column 'Vic. Points'
++#: ../client/gtk/connect.c:1088
++msgid "Points needed to win"
++msgstr "è??å?©æ??é??ç??ç?¹æ?°"
++
++#. Column name
++#: ../client/gtk/connect.c:1092
++msgid "Sevens Rule"
++msgstr "æ??7ç??è§?å??"
++
++#. Tooltip for column 'Sevens Rule'
++#. Label
++#: ../client/gtk/connect.c:1100 ../common/gtk/game-rules.c:71
++msgid "Sevens rule"
++msgstr "æ??7ç??è§?å??"
++
++#. Column name
++#: ../client/gtk/connect.c:1104
++msgid "Host"
++msgstr "æ??å?¡å?¨"
++
++#. Tooltip for column 'Host'
++#: ../client/gtk/connect.c:1113
++msgid "Host of the game"
++msgstr "æ¸¸æ??æ??å?¡å?¨"
++
++#. Column name
++#: ../client/gtk/connect.c:1119
++msgid "Port"
++msgstr "ç«¯å?£"
++
++#. Tooltip for column 'Port'
++#: ../client/gtk/connect.c:1127
++msgid "Port of the game"
++msgstr "æ¸¸æ??ç«¯å?£"
++
++#. Column name
++#: ../client/gtk/connect.c:1131
++msgid "Version"
++msgstr "ç??æ?¬"
++
++#. Tooltip for column 'Version'
++#: ../client/gtk/connect.c:1139
++msgid "Version of the host"
++msgstr "ä¸»æ?ºç??æ?¬"
++
++#. Dialog caption
++#: ../client/gtk/connect.c:1224
++msgid "Start a New Game"
++msgstr "å?¯å?¨æ?°æ¸¸æ??"
++
++#. Label
++#. Commandline option of client: name of the player
++#: ../client/gtk/connect.c:1251 ../client/gtk/offline.c:58
++msgid "Player name"
++msgstr "ç?©å®¶å§?å??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1267
++msgid "Enter your name"
++msgstr "è¾?å?¥ä½ ç??å§?å??"
++
++#. Check button
++#. Role of the player: spectator
++#: ../client/gtk/connect.c:1270 ../server/gtk/main.c:659
++msgid "Spectator"
++msgstr "è§?ä¼?"
++
++#: ../client/gtk/connect.c:1280
++msgid "Check if you want to be a spectator"
++msgstr "å¦?æ??è¦?å½?è§?ä¼?è¯·é??ä¸?"
++
++#. Label
++#: ../client/gtk/connect.c:1291
++msgid "Avahi"
++msgstr "Avahi"
++
++#. Button
++#: ../client/gtk/connect.c:1298
++msgid "Join"
++msgstr "å? å?¥"
++
++#. Tooltip for button Join
++#: ../client/gtk/connect.c:1302
++msgid "Join an automatically discovered game"
++msgstr "å? å?¥ä¸?ä¸ªè?ªå?¨å??ç?°ç??æ¸¸æ??"
++
++#. Label
++#. meta server label
++#: ../client/gtk/connect.c:1329 ../server/gtk/main.c:569
++msgid "Metaserver"
++msgstr "ä¸è½¬æ??å?¡å?¨"
++
++#. Button
++#: ../client/gtk/connect.c:1351
++msgid "Join Public Game"
++msgstr "å? å?¥å?¬å?±æ¸¸æ??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1357
++msgid "Join a public game"
++msgstr "å? å?¥ä¸?ä¸ªå?¬å?±æ¸¸æ??"
++
++#. Button
++#: ../client/gtk/connect.c:1362
++msgid "Create Game"
++msgstr "å??å»ºæ¸¸æ??"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1366
++msgid "Create a game"
++msgstr "å??å»ºä¸?ä¸ªæ¸¸æ??"
++
++#. Button
++#: ../client/gtk/connect.c:1377
++msgid "Join Private Game"
++msgstr "å? å?¥ç§?äººæ¸¸æ??"
++
++#. Tooltip
++#. Dialog caption
++#: ../client/gtk/connect.c:1381 ../client/gtk/connect.c:1526
++msgid "Join a private game"
++msgstr "å? å?¥ä¸?ä¸ªç§?äººæ¸¸æ??"
++
++#. Label
++#. Commandline option of client: hostname of the server
++#: ../client/gtk/connect.c:1562 ../client/gtk/offline.c:52
++msgid "Server host"
++msgstr "æ??å?¡å?¨ä¸»æ?º"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1576
++msgid "Name of the host of the game"
++msgstr "æ¸¸æ??ä¸»æ?ºå??ç§°"
++
++#. Label
++#. Commandline option of client: port of the server
++#. server port label
++#: ../client/gtk/connect.c:1580 ../client/gtk/offline.c:55
++#: ../server/gtk/main.c:531
++msgid "Server port"
++msgstr "æ??å?¡å?¨ç«¯å?£"
++
++#. Tooltip
++#: ../client/gtk/connect.c:1597
++msgid "Port of the host of the game"
++msgstr "æ¸¸æ??ä¸»æ?ºç«¯å?£"
++
++#. Tooltip
++#. Label
++#: ../client/gtk/connect.c:1639 ../client/gtk/connect.c:1642
++msgid "Recent games"
++msgstr "æ??è¿?ç??æ¸¸æ??"
++
++#. Caption for list of bought development cards
++#: ../client/gtk/develop.c:130
++msgid "<b>Development cards</b>"
++msgstr "<b>å??å±?å?¡</b>"
++
++#. Button text: play development card
++#: ../client/gtk/develop.c:163
++msgid "Play Card"
++msgstr "ä½¿ç?¨å??å±?å?¡"
++
++#. Dialog caption
++#: ../client/gtk/discard.c:78
++msgid "Discard Resources"
++msgstr "ä¸¢å¼?èµ?æº?"
++
++#: ../client/gtk/discard.c:101
++#, c-format
++msgid "You must discard %d resource"
++msgid_plural "You must discard %d resources"
++msgstr[0] "ä½ å¿?é¡»ä¸¢å¼?%dä¸ªèµ?æº?"
++
++#. Label
++#: ../client/gtk/discard.c:110
++msgid "Total discards"
++msgstr "å?¨é?¨ä¸¢å¼?"
++
++#. Caption for list of player that must discard cards
++#: ../client/gtk/discard.c:235
++msgid "<b>Waiting for players to discard</b>"
++msgstr "<b>ç?å¾?ç?©å®¶ä¸¢å¼?</b>"
++
++#. Dialog caption
++#: ../client/gtk/gameover.c:34
++msgid "Game Over"
++msgstr "æ¸¸æ??ç»?æ??"
++
++#: ../client/gtk/gameover.c:51
++#, c-format
++msgid "%s has won the game with %d victory points!"
++msgstr "%s å¾?äº? %d å??ï¼?èµ¢å¾?äº?æ¸¸æ??ç??è??å?©ï¼?"
++
++#: ../client/gtk/gameover.c:57
++#, c-format
++msgid "All praise %s, Lord of the known world!"
++msgstr "èµ?ç¾? %sï¼?ä¸?ç??ç??é?¸ä¸»ï¼?"
++
++#. Dialog caption
++#: ../client/gtk/gold.c:73
++msgid "Choose Resources"
++msgstr "é??æ?©èµ?æº?"
++
++#: ../client/gtk/gold.c:96
++#, c-format
++msgid "You may choose %d resource"
++msgid_plural "You may choose %d resources"
++msgstr[0] "ä½ å?¯ä»¥é??æ?© %d ä¸ªèµ?æº?"
++
++#. Text for total in choose gold dialog
++#. Text for total in year of plenty dialog
++#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:102
++msgid "Total resources"
++msgstr "æ?»èµ?æº?æ?°"
++
++#. Caption for list of player that must choose gold
++#: ../client/gtk/gold.c:217
++msgid "<b>Waiting for players to choose</b>"
++msgstr "<b>ç?å¾?ç?©å®¶é??æ?©</b>"
++
++#. Menu entry
++#: ../client/gtk/gui.c:229 ../server/gtk/main.c:92
++msgid "_Game"
++msgstr "æ¸¸æ??(_G)"
++
++#. Menu entry
++#: ../client/gtk/gui.c:232
++msgid "_New Game"
++msgstr "æ?°æ¸¸æ??(_N)"
++
++#. Tooltip for New Game menu entry
++#: ../client/gtk/gui.c:234
++msgid "Start a new game"
++msgstr "å¼?å§?ä¸?ä¸ªæ?°æ¸¸æ??"
++
++#. Menu entry
++#: ../client/gtk/gui.c:237
++msgid "_Leave Game"
++msgstr "ç¦»å¼?æ¸¸æ??(_L)"
++
++#. Tooltip for Leave Game menu entry
++#: ../client/gtk/gui.c:239
++msgid "Leave this game"
++msgstr "ç¦»å¼?å½?å??æ¸¸æ??"
++
++#. Menu entry
++#: ../client/gtk/gui.c:243
++msgid "_Admin"
++msgstr "ç®¡ç??(_A)"
++
++#. Tooltip for Admin menu entry
++#: ../client/gtk/gui.c:245
++msgid "Administer Pioneers server"
++msgstr "ç®¡ç??å??Pioneersæ??å?¡å?¨"
++
++#. Menu entry
++#: ../client/gtk/gui.c:249
++msgid "_Player Name"
++msgstr "ç?©å®¶å§?å??(_P)"
++
++#. Tooltip for Player Name menu entry
++#: ../client/gtk/gui.c:251
++msgid "Change your player name"
++msgstr "ä¿®æ?¹ç?©å®¶å§?å??"
++
++#. Menu entry
++#: ../client/gtk/gui.c:254
++msgid "L_egend"
++msgstr "å?¾ä¾?(_E)"
++
++#. Tooltip for Legend menu entry
++#: ../client/gtk/gui.c:256
++msgid "Terrain legend and building costs"
++msgstr "å?°å½¢å?¾ä¾?å??å»ºç?æ¶?è´¹"
++
++#. Menu entry
++#: ../client/gtk/gui.c:259
++msgid "_Game Settings"
++msgstr "æ¸¸æ??è®¾ç½®(_G)"
++
++#. Tooltip for Game Settings menu entry
++#: ../client/gtk/gui.c:261
++msgid "Settings for the current game"
++msgstr "å½?å??æ¸¸æ??ç??è®¾ç½®"
++
++#. Menu entry
++#: ../client/gtk/gui.c:264
++msgid "_Dice Histogram"
++msgstr "éª°å?æ?±ç?¶å?¾(_D)"
++
++#. Tooltip for Dice Histogram menu entry
++#: ../client/gtk/gui.c:266
++msgid "Histogram of dice rolls"
++msgstr "éª°å?ç»?æ??æ?±ç?¶å?¾"
++
++#. Menu entry
++#: ../client/gtk/gui.c:269 ../editor/gtk/editor.c:1335
++#: ../server/gtk/main.c:104
++msgid "_Quit"
++msgstr "é??å?º(_Q)"
++
++#. Tooltip for Quit menu entry
++#. Tooltop for Quit menu entry
++#: ../client/gtk/gui.c:271 ../server/gtk/main.c:106
++msgid "Quit the program"
++msgstr "é??å?ºç¨?åº?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:274
++msgid "_Actions"
++msgstr "è¡?å?¨(_A)"
++
++#. Menu entry
++#: ../client/gtk/gui.c:277
++msgid "Roll Dice"
++msgstr "æ?·éª°å?"
++
++#. Tooltip for Roll Dice menu entry
++#: ../client/gtk/gui.c:279
++msgid "Roll the dice"
++msgstr "æ?·éª°å?"
++
++#. Menu entry
++#. Tooltip for Trade menu entry
++#. Tab page name
++#: ../client/gtk/gui.c:282 ../client/gtk/gui.c:284 ../client/gtk/gui.c:716
++msgid "Trade"
++msgstr "äº¤æ??"
++
++#. Menu entry
++#. Tooltip for Undo menu entry
++#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290
++msgid "Undo"
++msgstr "æ?¤æ¶?"
++
++#. Menu entry
++#. Tooltip for Finish menu entry
++#: ../client/gtk/gui.c:293 ../client/gtk/gui.c:295
++msgid "Finish"
++msgstr "å®?æ??"
++
++#. Menu entry
++#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:192
++#: ../editor/gtk/game-buildings.c:10
++msgid "Road"
++msgstr "é??è·¯"
++
++#. Tooltip for Road menu entry
++#: ../client/gtk/gui.c:300
++msgid "Build a road"
++msgstr "ä¿®ä¸?æ?¡è·¯"
++
++#. Menu entry
++#: ../client/gtk/gui.c:303 ../client/gtk/legend.c:196
++#: ../editor/gtk/game-buildings.c:10
++msgid "Ship"
++msgstr "è½®è?¹"
++
++#. Tooltip for Ship menu entry
++#: ../client/gtk/gui.c:305
++msgid "Build a ship"
++msgstr "é? ä¸?æ?¡è?¹"
++
++#. Menu entry
++#: ../client/gtk/gui.c:308
++msgid "Move Ship"
++msgstr "ç§»å?¨è?¹"
++
++#. Tooltip for Move Ship menu entry
++#: ../client/gtk/gui.c:310
++msgid "Move a ship"
++msgstr "ç§»å?¨ä¸?è??è?¹"
++
++#. Menu entry
++#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:199
++#: ../editor/gtk/game-buildings.c:10
++msgid "Bridge"
++msgstr "æ¡¥æ¢?"
++
++#. Tooltip for Bridge menu entry
++#: ../client/gtk/gui.c:315
++msgid "Build a bridge"
++msgstr "å»ºä¸?åº§æ¡¥"
++
++#. Menu entry
++#: ../client/gtk/gui.c:318 ../client/gtk/legend.c:201
++#: ../client/gtk/player.c:53 ../editor/gtk/game-buildings.c:10
++msgid "Settlement"
++msgstr "æ?¿å?"
++
++#. Tooltip for Settlement menu entry
++#: ../client/gtk/gui.c:321
++msgid "Build a settlement"
++msgstr "å»ºä¸?ä¸ªæ?¿å?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:324 ../client/gtk/legend.c:202
++#: ../client/gtk/player.c:54 ../editor/gtk/game-buildings.c:11
++msgid "City"
++msgstr "å??å¸?"
++
++#. Tooltip for City menu entry
++#: ../client/gtk/gui.c:326
++msgid "Build a city"
++msgstr "å»ºä¸?ä¸ªå??å¸?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:329
++msgid "Develop"
++msgstr "å??å±?å?¡"
++
++#. Tooltip for Develop menu entry
++#: ../client/gtk/gui.c:331
++msgid "Buy a development card"
++msgstr "ä¹°ä¸?å¼ å??å±?å?¡"
++
++#. Menu entry
++#: ../client/gtk/gui.c:334
++msgid "City Wall"
++msgstr "å??å¢?"
++
++#. Tooltip for City Wall menu entry
++#: ../client/gtk/gui.c:336
++msgid "Build a city wall"
++msgstr "ä¿®ä¸?å µå??å¢?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:340
++msgid "_Settings"
++msgstr "è®¾ç½®(_S)"
++
++#. Menu entry
++#: ../client/gtk/gui.c:343
++msgid "Prefere_nces"
++msgstr "å??å¥½(_N)"
++
++#. Tooltip for Preferences menu entry
++#: ../client/gtk/gui.c:345
++msgid "Configure the application"
++msgstr "è®¾ç½®åº?ç?¨ç¨?åº?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:349 ../editor/gtk/editor.c:1297
++msgid "_View"
++msgstr "æ?¥ç??(_V)"
++
++#. Menu entry
++#: ../client/gtk/gui.c:352 ../editor/gtk/editor.c:1341
++msgid "_Reset"
++msgstr "é??ç½®(_R)"
++
++#. Tooltip for Reset menu entry
++#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1344
++msgid "View the full map"
++msgstr "æ?¥ç??å®?æ?´å?°å?¾"
++
++#. Menu entry
++#: ../client/gtk/gui.c:358 ../editor/gtk/editor.c:1347
++msgid "_Center"
++msgstr "å±?ä¸(_C)"
++
++#. Tooltip for Center menu entry
++#: ../client/gtk/gui.c:360 ../editor/gtk/editor.c:1349
++msgid "Center the map"
++msgstr "è®©å?°å?¾å±?ä¸"
++
++#. Menu entry
++#: ../client/gtk/gui.c:364 ../client/gtk/gui.c:373 ../editor/gtk/editor.c:1300
++#: ../server/gtk/main.c:95
++msgid "_Help"
++msgstr "å¸®å?©(_H)"
++
++#. Menu entry
++#: ../client/gtk/gui.c:367
++msgid "_About Pioneers"
++msgstr "å?³äº?Pioneers(_A)"
++
++#. Tooltip for About Pioneers menu entry
++#: ../client/gtk/gui.c:369
++msgid "Information about Pioneers"
++msgstr "Pioneersç??ä¿¡æ?¯"
++
++#. Tooltip for Help menu entry
++#: ../client/gtk/gui.c:375 ../client/gtk/gui.c:1278
++msgid "Show the manual"
++msgstr "æ?¾ç¤ºæ¸¸æ??æ??å??"
++
++#. Menu entry
++#: ../client/gtk/gui.c:383 ../editor/gtk/editor.c:1367
++msgid "_Fullscreen"
++msgstr "å?¨å±?(_F)"
++
++#. Tooltip for Fullscreen menu entry
++#: ../client/gtk/gui.c:386 ../editor/gtk/editor.c:1370
++msgid "Set window to full screen mode"
++msgstr "è¿?å?¥å?¨å±?æ¨¡å¼?"
++
++#. Menu entry
++#: ../client/gtk/gui.c:391
++msgid "_Toolbar"
++msgstr "å·¥å?·æ ?(_T)"
++
++#. Tooltip for Toolbar menu entry
++#: ../client/gtk/gui.c:393
++msgid "Show or hide the toolbar"
++msgstr "æ?¾ç¤ºæ??é??è??å·¥å?·æ ?"
++
++#. Victory points target in statusbar
++#: ../client/gtk/gui.c:496
++#, c-format
++msgid "Points needed to win: %i"
++msgstr "è??å?©é??è¦?ç??å??æ?°ï¼?%i"
++
++#: ../client/gtk/gui.c:582
++msgid "<b>Messages</b>"
++msgstr "<b>æ¶?æ?¯</b>"
++
++#. Tab page name
++#: ../client/gtk/gui.c:709 ../editor/gtk/editor.c:1520
++msgid "Map"
++msgstr "å?°å?¾"
++
++#. Tooltip
++#: ../client/gtk/gui.c:718
++msgid "Finish trading"
++msgstr "å®?æ??äº¤æ??"
++
++#. Tab page name
++#. Button text
++#: ../client/gtk/gui.c:728 ../client/gtk/quote.c:339
++msgid "Quote"
++msgstr "æ?¥ä»·"
++
++#. Tooltip
++#: ../client/gtk/gui.c:730
++msgid "Reject domestic trade"
++msgstr "æ??ç»?å??é?¨äº¤æ??"
++
++#. Tab page name
++#. Dialog caption
++#: ../client/gtk/gui.c:740 ../client/gtk/legend.c:228
++msgid "Legend"
++msgstr "å?¾ä¾?"
++
++#. Tab page name, shown for the splash screen
++#: ../client/gtk/gui.c:763
++msgid "Welcome to Pioneers"
++msgstr "æ¬¢è¿?æ?¥å?°Pioneers"
++
++#. Caption of preferences dialog
++#: ../client/gtk/gui.c:1047
++msgid "Pioneers Preferences"
++msgstr "Pioneers å??å¥½è®¾ç½®"
++
++#. Label for changing the theme, in the preferences dialog
++#: ../client/gtk/gui.c:1077
++msgid "Theme:"
++msgstr "ä¸»é¢?ï¼?"
++
++#. Tooltip for changing the theme in the preferences dialog
++#: ../client/gtk/gui.c:1100
++msgid "Choose one of the themes"
++msgstr "é??æ?©ä¸?ä¸ªä¸»é¢?"
++
++#. Label for the option to show the legend
++#: ../client/gtk/gui.c:1104
++msgid "Show legend"
++msgstr "æ?¾ç¤ºå?¾ä¾?"
++
++#. Tooltip for the option to show the legend
++#: ../client/gtk/gui.c:1114
++msgid "Show the legend as a page beside the map"
++msgstr "å?¨å?°å?¾æ??ä»¥ä¸?ä¸ªæ?°é¡µé?¢æ?¥æ?¾ç¤ºå?¾ä¾?"
++
++#. Label for the option to display log messages in color
++#: ../client/gtk/gui.c:1119
++msgid "Messages with color"
++msgstr "å½©è?²æ¶?æ?¯"
++
++#. Tooltip for the option to display log messages in color
++#: ../client/gtk/gui.c:1129
++msgid "Show new messages with color"
++msgstr "ç?¨å½©è?²æ?¾ç¤ºæ?°æ¶?æ?¯"
++
++#. Label for the option to display chat in color of player
++#: ../client/gtk/gui.c:1134
++msgid "Chat in color of player"
++msgstr "ç?¨ç?©å®¶é¢?è?²æ?¾ç¤ºè??å¤©"
++
++#. Tooltip for the option to display chat in color of player
++#: ../client/gtk/gui.c:1145
++msgid "Show new chat messages in the color of the player"
++msgstr "ç?¨ç?©å®¶é¢?è?²æ?¾ç¤ºæ?°è??å¤©æ¶?æ?¯"
++
++#. Label for the option to display the summary with colors
++#: ../client/gtk/gui.c:1150
++msgid "Summary with color"
++msgstr "å½©è?²æ±?æ?»"
++
++#. Tooltip for the option to display the summary with colors
++#: ../client/gtk/gui.c:1161
++msgid "Use colors in the player summary"
++msgstr "ä½¿ç?¨å½©è?²æ?¾ç¤ºç?©å®¶ä¿¡æ?¯æ±?æ?»"
++
++#. Label for the option to display keyboard accelerators in the toolbar
++#: ../client/gtk/gui.c:1166
++msgid "Toolbar with shortcuts"
++msgstr "å·¥å?·æ ?å¸¦å¿«æ?·æ?¹å¼?"
++
++#. Tooltip for the option to display keyboard accelerators in the toolbar
++#: ../client/gtk/gui.c:1176
++msgid "Show keyboard shortcuts in the toolbar"
++msgstr "å?¨å·¥å?·æ ?ä¸æ?¾ç¤ºé?®ç??å¿«æ?·é?®"
++
++#. Label for the option to disable all sounds
++#: ../client/gtk/gui.c:1182
++msgid "Silent mode"
++msgstr "å®?é??æ¨¡å¼?"
++
++#. Tooltip for the option to disable all sounds
++#: ../client/gtk/gui.c:1188
++msgid "In silent mode no sounds are made"
++msgstr "å?¨å®?é??æ¨¡å¼?ä¸?ä¸?ä¼?å??å?ºå£°é?³"
++
++#. Label for the option to announce when players/spectators enter
++#: ../client/gtk/gui.c:1194
++msgid "Announce new players"
++msgstr "æ?°ç?©å®¶æ??ç¤º"
++
++#. Tooltip for the option to use sound when players/spectators enter
++#: ../client/gtk/gui.c:1204
++msgid "Make a sound when a new player or spectator enters the game"
++msgstr "å½?ä¸?ä¸ªæ?°ç?©å®¶æ??è??è§?ä¼?è¿?å?¥æ¸¸æ??æ?¶å??å?ºå£°é?³æ??ç¤º"
++
++#. Label for the option to use the notifications.
++#: ../client/gtk/gui.c:1216
++msgid "Show notifications"
++msgstr "æ?¾ç¤ºé??ç?¥"
++
++#. Tooltip for notifications option.
++#: ../client/gtk/gui.c:1226
++msgid "Show notifications when it's your turn or when new trade is available"
++msgstr "è½®å?°ä½ æ??è??æ??å?¯ç?¨ç??æ?°äº¤æ??æ?¶æ?¾ç¤ºé??ç?¥"
++
++#. Label for the option to use the 16:9 layout.
++#: ../client/gtk/gui.c:1232
++msgid "Use 16:9 layout"
++msgstr "ä½¿ç?¨16:9å¸?å±?"
++
++#. Tooltip for 16:9 option.
++#: ../client/gtk/gui.c:1242
++msgid "Use a 16:9 friendly layout for the window"
++msgstr "ä¸ºçª?å?£ä½¿ç?¨16:9ç??å??å¥½å¸?å±?"
++
++#. Caption of about box
++#: ../client/gtk/gui.c:1254
++msgid "About Pioneers"
++msgstr "å?³äº? Pioneers"
++
++#. Initial text in status bar
++#: ../client/gtk/gui.c:1565 ../client/gtk/offline.c:108
++msgid "Welcome to Pioneers!"
++msgstr "æ¬¢è¿?æ?¥å?°Pioneersï¼?"
++
++#. The name of the application
++#. Name of the application
++#: ../client/gtk/gui.c:1627 ../client/gtk/offline.c:202
++#: ../client/gtk/pioneers.desktop.in.h:1
++msgid "Pioneers"
++msgstr "Pioneers"
++
++#. Dialog caption
++#: ../client/gtk/histogram.c:259
++msgid "Dice Histogram"
++msgstr "éª°å?æ?±ç?¶å?¾"
++
++#: ../client/gtk/interface.c:95
++msgid "Ship movement canceled."
++msgstr "å??æ¶?äº?è?¹ç??ç§»å?¨ã??"
++
++#: ../client/gtk/interface.c:103 ../client/gtk/interface.c:104
++msgid "Select a new location for the ship."
++msgstr "ä¸ºè?¹é??æ?©ä¸?ä¸ªæ?°ä½?ç½®ã??"
++
++#. Notification
++#: ../client/gtk/interface.c:892
++msgid "It is your turn to setup."
++msgstr "è½®å?°ä½ å??å¤?äº?ã??"
++
++#: ../client/gtk/legend.c:33
++msgid "Hill"
++msgstr "å°?å±±"
++
++#: ../client/gtk/legend.c:34
++msgid "Field"
++msgstr "ç?°é??"
++
++#: ../client/gtk/legend.c:35
++msgid "Mountain"
++msgstr "å¤§å±±"
++
++#: ../client/gtk/legend.c:36
++msgid "Pasture"
++msgstr "è??å??"
++
++#: ../client/gtk/legend.c:37
++msgid "Forest"
++msgstr "æ£®æ??"
++
++#: ../client/gtk/legend.c:38
++msgid "Desert"
++msgstr "æ²?æ¼ "
++
++#: ../client/gtk/legend.c:39
++msgid "Sea"
++msgstr "å¤§æµ·"
++
++#. Label
++#: ../client/gtk/legend.c:135
++msgid "<b>Terrain yield</b>"
++msgstr "<b>å?°å½¢äº§é??</b>"
++
++#. Label
++#: ../client/gtk/legend.c:168
++msgid "<b>Building costs</b>"
++msgstr "<b>å»ºé? æ¶?è´¹</b>"
++
++#: ../client/gtk/legend.c:206 ../client/gtk/player.c:55
++#: ../editor/gtk/game-buildings.c:11
++msgid "City wall"
++msgstr "å??å¢?"
++
++#: ../client/gtk/legend.c:209 ../client/gtk/player.c:66
++msgid "Development card"
++msgstr "å??å±?å?¡"
++
++#. Dialog caption
++#. Name of the development card
++#: ../client/gtk/monopoly.c:84 ../common/cards.c:125
++msgid "Monopoly"
++msgstr "å??æ?"
++
++#. Label
++#: ../client/gtk/monopoly.c:105
++msgid "Select the resource you wish to monopolize."
++msgstr "é??æ?©ä¸?ç§?èµ?æº?ï¼?ä½ å°?ç?¬å? å®?ã??"
++
++#. Dialog caption
++#: ../client/gtk/name.c:134
++msgid "Change Player Name"
++msgstr "ä¿®æ?¹ç?©å®¶å§?å??"
++
++#. Label
++#: ../client/gtk/name.c:163
++msgid "Player name:"
++msgstr "ç?©å®¶å§?å??ï¼?"
++
++#. Label: set player icon preferences
++#: ../client/gtk/name.c:222
++msgid "Face:"
++msgstr "å¤´å??ï¼?"
++
++#. Label: set player icon preferences
++#: ../client/gtk/name.c:238
++msgid "Variant:"
++msgstr "å?¯å??é¡¹ï¼?"
++
++#: ../client/gtk/offline.c:62
++msgid "Connect as a spectator"
++msgstr "ä½?ä¸ºä¸?ä¸ªè§?ä¼?è¿?æ?¥"
++
++#: ../client/gtk/offline.c:65
++msgid "Metaserver Host"
++msgstr "ä¸è½¬æ??å?¡å?¨å?°å??"
++
++#: ../client/gtk/offline.c:79
++msgid "Select a game to join."
++msgstr "é??æ?©ä¸?ä¸ªæ¸¸æ??æ?¥å? å?¥ã??"
++
++#: ../client/gtk/offline.c:95
++msgid "Connecting"
++msgstr "æ£å?¨è¿?æ?¥"
++
++#. Long description in the commandline for pioneers: help
++#: ../client/gtk/offline.c:170
++msgid "- Play a game of Pioneers"
++msgstr "- ç?©ä¸?å?ºPioneers"
++
++#: ../client/gtk/pioneers.desktop.in.h:2
++msgid "Play a game of Pioneers"
++msgstr "ç?©ä¸?å?ºPioneers"
++
++#: ../client/gtk/player.c:53
++msgid "Settlements"
++msgstr "æ?¿å?"
++
++#: ../client/gtk/player.c:54
++msgid "Cities"
++msgstr "å??å¸?"
++
++#: ../client/gtk/player.c:55
++msgid "City walls"
++msgstr "å??å¢?"
++
++#: ../client/gtk/player.c:56
++msgid "Largest army"
++msgstr "æ??å¤§å??é??"
++
++#: ../client/gtk/player.c:57
++msgid "Longest road"
++msgstr "æ??é?¿é??è·¯"
++
++#. Name of the development card
++#: ../client/gtk/player.c:58 ../common/cards.c:131
++msgid "Chapel"
++msgstr "æ??å ?"
++
++#: ../client/gtk/player.c:58
++msgid "Chapels"
++msgstr "æ??å ?"
++
++#. Name of the development card
++#: ../client/gtk/player.c:59 ../common/cards.c:134
++msgid "Pioneer university"
++msgstr "Pioneerå¤§å¦"
++
++#: ../client/gtk/player.c:59
++msgid "Pioneer universities"
++msgstr "Pioneerå¤§å¦"
++
++#. Name of the development card
++#: ../client/gtk/player.c:61 ../common/cards.c:137
++msgid "Governor's house"
++msgstr "æ?¿åº?å¤§æ¥¼"
++
++#: ../client/gtk/player.c:61
++msgid "Governor's houses"
++msgstr "æ?¿åº?å¤§æ¥¼"
++
++#. Name of the development card
++#: ../client/gtk/player.c:62 ../common/cards.c:140
++msgid "Library"
++msgstr "å?¾ä¹¦é¦?"
++
++#: ../client/gtk/player.c:62
++msgid "Libraries"
++msgstr "å?¾ä¹¦é¦?"
++
++#. Name of the development card
++#: ../client/gtk/player.c:63 ../common/cards.c:143
++msgid "Market"
++msgstr "å¸?å?º"
++
++#: ../client/gtk/player.c:63
++msgid "Markets"
++msgstr "å¸?å?º"
++
++#. Name of the development card
++#: ../client/gtk/player.c:64 ../common/cards.c:146
++msgid "Soldier"
++msgstr "æ??å£«"
++
++#: ../client/gtk/player.c:64
++msgid "Soldiers"
++msgstr "æ??å£«"
++
++#: ../client/gtk/player.c:65
++msgid "Resource card"
++msgstr "èµ?æº?å?¡"
++
++#: ../client/gtk/player.c:65
++msgid "Resource cards"
++msgstr "èµ?æº?å?¡"
++
++#. Caption
++#: ../client/gtk/player.c:66 ../editor/gtk/editor.c:895
++msgid "Development cards"
++msgstr "å??å±?å?¡"
++
++#. Caption for the overview of the points and card of other players
++#: ../client/gtk/player.c:555
++msgid "<b>Player summary</b>"
++msgstr "<b>ç?©å®¶ä¿¡æ?¯æ±?æ?»</b>"
++
++#. Dialog caption
++#: ../client/gtk/plenty.c:61
++msgid "Year of Plenty"
++msgstr "ä¸°æ?¶å¹´"
++
++#: ../client/gtk/plenty.c:91
++msgid "Please choose one resource from the bank"
++msgstr "è¯·ä»?é?¶è¡?é??æ?©ä¸?ä¸ªèµ?æº?"
++
++#: ../client/gtk/plenty.c:94
++msgid "Please choose two resources from the bank"
++msgstr "è¯·ä»?é?¶è¡?é??æ?©ä¸¤ä¸ªèµ?æº?"
++
++#: ../client/gtk/plenty.c:96
++msgid "The bank is empty"
++msgstr "é?¶è¡?è¢«æ·?ç©ºäº?"
++
++#: ../client/gtk/quote.c:187
++#, c-format
++msgid "%s has %s, and is looking for %s"
++msgstr "%s æ?? %sï¼?æ?³è¦? %s"
++
++#. Notification
++#: ../client/gtk/quote.c:217
++#, c-format
++msgid "New offer from %s."
++msgstr "%s æ??ä¾?äº?ä¸?ä¸ªæ?°æ?¹æ¡?ã??"
++
++#. Notification
++#: ../client/gtk/quote.c:242
++#, c-format
++msgid "Offer from %s."
++msgstr "%s æ??ä¾?äº?ä¸?ä¸ªæ?¹æ¡?ã??"
++
++#. Label
++#. Frame title, trade: I want to trade these resources
++#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524
++msgid "I want"
++msgstr "æ??è¦?"
++
++#. Label
++#. Frame title, trade: I want these resources in return
++#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530
++msgid "Give them"
++msgstr "ç»?ä»?ä»¬"
++
++#. Button text
++#: ../client/gtk/quote.c:345
++msgid "Delete"
++msgstr "å? é?¤"
++
++#. Button text
++#: ../client/gtk/quote.c:370
++msgid "Reject Domestic Trade"
++msgstr "æ??ç»?å??é?¨äº¤æ??"
++
++#. Now create columns
++#. Table header: Player who trades
++#. Role of the player: player
++#: ../client/gtk/quote-view.c:171 ../server/gtk/main.c:661
++msgid "Player"
++msgstr "ç?©å®¶"
++
++#. Table header: Quote
++#: ../client/gtk/quote-view.c:186
++msgid "Quotes"
++msgstr "æ?¥ä»·"
++
++#. trade: maritime quote: %1 resources of type %2 for
++#. * one resource of type %3
++#: ../client/gtk/quote-view.c:302
++#, c-format
++msgid "%d:1 %s for %s"
++msgstr "%d:1 %s æ?¢ %s"
++
++#. Trade: a player has rejected trade
++#: ../client/gtk/quote-view.c:441
++msgid "Rejected trade"
++msgstr "å·²æ??ç»?äº¤æ??"
++
++#. Caption for overview of the resources of the player
++#: ../client/gtk/resource.c:72
++msgid "<b>Resources</b>"
++msgstr "<b>èµ?æº?</b>"
++
++#. Label
++#: ../client/gtk/resource.c:87
++msgid "Total"
++msgstr "æ?»æ?°"
++
++#. Tooltip for the amount of resources in the hand
++#: ../client/gtk/resource-table.c:180
++msgid "Amount in hand"
++msgstr "æ??ä¸?ç??æ?»æ?°"
++
++#. Button for decreasing the selected amount
++#: ../client/gtk/resource-table.c:185
++msgid "<less"
++msgstr "<å??å°?"
++
++#. Tooltip for decreasing the selected amount
++#: ../client/gtk/resource-table.c:195
++msgid "Decrease the selected amount"
++msgstr "å??å°?æ??é??ç??èµ?æº?æ?°é??"
++
++#. Tooltip for the amount of resources in the bank
++#: ../client/gtk/resource-table.c:209
++msgid "Amount in the bank"
++msgstr "é?¶è¡?èµ?æº?æ?»æ?°"
++
++#. Button for increasing the selected amount
++#: ../client/gtk/resource-table.c:214
++msgid "more>"
++msgstr "å¢?å? >"
++
++#. Tooltip for increasing the selected amount
++#: ../client/gtk/resource-table.c:226
++msgid "Increase the selected amount"
++msgstr "å¢?å? æ??é??èµ?æº?æ?°é??"
++
++#. Tooltip for the selected amount
++#: ../client/gtk/resource-table.c:243
++msgid "Selected amount"
++msgstr "é??æ?©ç??æ?°é??"
++
++#. Tooltip for the total selected amount
++#: ../client/gtk/resource-table.c:288
++msgid "Total selected amount"
++msgstr "æ??é??èµ?æº?æ?»æ?°"
++
++#. Tooltip when the bank cannot be emptied
++#: ../client/gtk/resource-table.c:307
++msgid "The bank cannot be emptied"
++msgstr "é?¶è¡?ä¸?è?½è¢«æ·?ç©º"
++
++#: ../client/gtk/settingscreen.c:74
++msgid "Yes"
++msgstr "æ?¯"
++
++#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:222
++msgid "No"
++msgstr "å?¦"
++
++#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187
++msgid "Unknown"
++msgstr "æ?ªç?¥"
++
++#: ../client/gtk/settingscreen.c:121
++msgid "No game in progress..."
++msgstr "æ²¡æ??æ£å?¨è¿?è¡?ç??æ¸¸æ??..."
++
++#. Label
++#: ../client/gtk/settingscreen.c:132
++msgid "<b>General settings</b>"
++msgstr "<b>ä¸?è?¬è®¾ç½®</b>"
++
++#: ../client/gtk/settingscreen.c:149
++msgid "Number of players:"
++msgstr "ç?©å®¶æ?°ç?®ï¼?"
++
++#: ../client/gtk/settingscreen.c:153
++msgid "Victory point target:"
++msgstr "ç?®æ ?è??å?©å??æ?°ï¼?"
++
++#: ../client/gtk/settingscreen.c:157
++msgid "Random terrain:"
++msgstr "é??æ?ºå?°å½¢ï¼?"
++
++#: ../client/gtk/settingscreen.c:161
++msgid "Allow trade between players:"
++msgstr "å??è®¸ç?©å®¶ä¹?é?´äº¤æ??ï¼?"
++
++#: ../client/gtk/settingscreen.c:166
++msgid "Allow trade only before building or buying:"
++msgstr "ä»?å??è®¸å?¨å»ºç?æ??è??è´ä¹°ä¹?å??è¿?è¡?äº¤æ??ï¼?"
++
++#: ../client/gtk/settingscreen.c:171
++msgid "Check victory only at end of turn:"
++msgstr "ä»?å?¨å??å??ç»?æ??æ?¶æ£?æ?¥æ?¯å?¦è??å?©ï¼?"
++
++#: ../client/gtk/settingscreen.c:176
++msgid "Amount of each resource:"
++msgstr "æ¯?ç§?èµ?æº?ç??æ?°é??ï¼?"
++
++#: ../client/gtk/settingscreen.c:190
++msgid "Sevens rule:"
++msgstr "æ??7ç??è§?å??ï¼?"
++
++#: ../client/gtk/settingscreen.c:196
++msgid "Use the pirate to block ships:"
++msgstr "ä½¿ç?¨æµ·ç??é?»æ¢è?¹å?ªï¼?"
++
++#: ../client/gtk/settingscreen.c:225
++msgid "Island discovery bonuses:"
++msgstr "å??ç?°å²?å±¿ç??å¥?å?±ï¼?"
++
++#. Label
++#: ../client/gtk/settingscreen.c:242
++msgid "<b>Building quotas</b>"
++msgstr "<b>å»ºç?å®?é¢?</b>"
++
++#: ../client/gtk/settingscreen.c:259
++msgid "Roads:"
++msgstr "é??è·¯ï¼?"
++
++#: ../client/gtk/settingscreen.c:265
++msgid "Settlements:"
++msgstr "æ?¿å?ï¼?"
++
++#: ../client/gtk/settingscreen.c:271
++msgid "Cities:"
++msgstr "å??å¸?ï¼?"
++
++#: ../client/gtk/settingscreen.c:277
++msgid "City walls:"
++msgstr "å??å¢?ï¼?"
++
++#: ../client/gtk/settingscreen.c:283
++msgid "Ships:"
++msgstr "è½®è?¹ï¼?"
++
++#: ../client/gtk/settingscreen.c:289
++msgid "Bridges:"
++msgstr "æ¡¥æ¢?ï¼?"
++
++#. Label
++#: ../client/gtk/settingscreen.c:302
++msgid "<b>Development card deck</b>"
++msgstr "<b>å??å±?å?¡å ?</b>"
++
++#: ../client/gtk/settingscreen.c:318
++msgid "Road building cards:"
++msgstr "é??è·¯ä¿®å»ºå?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:322
++msgid "Monopoly cards:"
++msgstr "å??æ?å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:326
++msgid "Year of plenty cards:"
++msgstr "ä¸°æ?¶å¹´å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:330
++msgid "Chapel cards:"
++msgstr "æ??å ?å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:334
++msgid "Pioneer university cards:"
++msgstr "Pioneer å¤§å¦å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:338
++msgid "Governor's house cards:"
++msgstr "æ?¿åº?å¤§æ¥¼å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:342
++msgid "Library cards:"
++msgstr "å?¾ä¹¦é¦?å?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:346
++msgid "Market cards:"
++msgstr "å¸?å?ºå?¡ï¼?"
++
++#: ../client/gtk/settingscreen.c:350
++msgid "Soldier cards:"
++msgstr "æ??å£«å?¡ï¼?"
++
++#. Dialog caption
++#: ../client/gtk/settingscreen.c:389
++msgid "Current Game Settings"
++msgstr "å½?å??æ¸¸æ??è®¾ç½®"
++
++#. trade: you ask for something for free
++#: ../client/gtk/trade.c:205
++#, c-format
++msgid "ask for %s for free"
++msgstr "è¦?ç?½å¾? %s"
++
++#. trade: you give something away for free
++#: ../client/gtk/trade.c:210
++#, c-format
++msgid "give %s for free"
++msgstr "ç?½ç»?äº? %s"
++
++#. trade: you trade something for something else
++#: ../client/gtk/trade.c:215
++#, c-format
++msgid "give %s for %s"
++msgstr "æ??ä¾? %sï¼?æ?³è¦? %s"
++
++#. I want some resources, and give them some resources
++#: ../client/gtk/trade.c:242
++#, c-format
++msgid "I want %s, and give them %s"
++msgstr "æ??è¦? %sï¼?æ??æ??ä¾? %s"
++
++#. Notification
++#: ../client/gtk/trade.c:348
++#, c-format
++msgid "Quote received from %s."
++msgstr "ä»? %s å¾?å?°äº?æ?¥ä»·ã??"
++
++#. Button text, trade: call for quotes from other players
++#: ../client/gtk/trade.c:539
++msgid "_Call for Quotes"
++msgstr "å??å?ºæ?¥ä»·(_C)"
++
++#. Button text: Trade page, accept selected quote
++#: ../client/gtk/trade.c:567
++msgid "_Accept Quote"
++msgstr "æ?¥å??æ?¥ä»·(_A)"
++
++#. Button text: Trade page, finish trading
++#: ../client/gtk/trade.c:573
++msgid "_Finish Trading"
++msgstr "å®?æ??äº¤æ??(_F)"
++
++#. Name of the development card
++#: ../common/cards.c:122
++msgid "Road building"
++msgstr "é??è·¯ä¿®å»º"
++
++#. Name of the development card
++#: ../common/cards.c:128
++msgid "Year of plenty"
++msgstr "ä¸°æ?¶å¹´"
++
++#. Description of the 'Road Building' development card
++#: ../common/cards.c:157
++msgid "Build two new roads"
++msgstr "ä¿®å»ºä¸¤æ?¡æ?°è·¯"
++
++#. Description of the 'Monopoly' development card
++#: ../common/cards.c:160
++msgid ""
++"Select a resource type and take every card of that type held by all other "
++"players"
++msgstr "é??æ?©ä¸?ç§?èµ?æº?ï¼?ç?¶å??æ?¿èµ°æ??æ??å?¶ä»?ç?©å®¶æ??ä¸?ç??è¿?ç§?èµ?æº?"
++
++#. Description of the 'Year of Plenty' development card
++#: ../common/cards.c:164
++msgid ""
++"Take two resource cards of any type from the bank (cards may be of the same "
++"or different types)"
++msgstr "ä»?é?¶è¡?æ?¿èµ°ä¸¤ä¸ªä»»æ??ç§?ç±»ç??èµ?æº?ï¼?å?¯ä»¥ç?¸å??æ??è??ä¸?å??ï¼?"
++
++#. Description of a development card of 1 victory point
++#: ../common/cards.c:173
++msgid "One victory point"
++msgstr "ä¸?ä¸ªè??å?©ç?¹"
++
++#. Description of the 'Soldier' development card
++#: ../common/cards.c:176
++msgid ""
++"Move the robber to a different space and take one resource card from another "
++"player adjacent to that space"
++msgstr "ç§»å?¨å¼ºç??å?°ä¸?ä¸ªä¸?å??ç??ä½?ç½®ï¼?ç?¶å??ä»?é?»è¿?ç??å?¦ä¸?ä¸ªç?©å®¶æ??ä¸?æ?¢èµ°ä¸?ä¸ªèµ?æº?"
++
++#: ../common/game.c:499
++#, c-format
++msgid "Obsolete rule: '%s'\n"
++msgstr "è¿?æ?¶ç??è§?å??ï¼?â??%sâ??\n"
++
++#: ../common/game.c:506
++#, c-format
++msgid ""
++"The game uses the new rule '%s', which is not yet supported. Consider "
++"upgrading.\n"
++msgstr "è¿?ä¸ªæ¸¸æ??ä½¿ç?¨äº?æ?°è§?å??â??%sâ??ï¼?æ??ä¸?æ?¯æ??ï¼?è¯·è??è??æ?´æ?°ã??\n"
++
++#: ../common/game.c:890 ../common/game.c:921
++msgid "This game cannot be won."
++msgstr "è¿?å?ºæ¸¸æ??ä¸?å?¯è?½èµ¢äº?ã??"
++
++#: ../common/game.c:891
++msgid "There is no land."
++msgstr "æ²¡æ??å??å?°äº?ã??"
++
++#: ../common/game.c:925
++msgid "It is possible that this game cannot be won."
++msgstr "è¿?å?ºæ¸¸æ??å?¯è?½æ? æ³?è??å?©äº?ã??"
++
++#: ../common/game.c:931
++msgid "This game can be won by only building all settlements and cities."
++msgstr "å?ªæ??æ??æ??æ?¿å?å??å??å¸?é?½å»ºå®?äº?è¿?å?ºæ¸¸æ??æ??è?½è??å?©ã??"
++
++#: ../common/game.c:937
++#, c-format
++msgid ""
++"Required victory points: %d\n"
++"Points obtained by building all: %d\n"
++"Points in development cards: %d\n"
++"Longest road/largest army: %d+%d\n"
++"Maximum island discovery bonus: %d\n"
++"Total: %d"
++msgstr ""
++"è¦?æ±?ç??è??å?©ç?¹ï¼?%d\n"
++"å»ºå®?æ??æ??å»ºç?å??å¾?å?°ç??ç?¹æ?°ï¼?%d\n"
++"å??å±?å?¡ä¸ç??ç?¹æ?°ï¼?%d\n"
++"æ??é?¿é??è·¯/æ??å¤§å??é??ï¼?%d+%d\n"
++"å??ç?°å²?å±¿ç??æ??å¤§å¥?å?±ï¼?%d\n"
++"æ?»æ?°ï¼?%d"
++
++#: ../common/gtk/aboutbox.c:76
++msgid ""
++"Pioneers is based upon the excellent\n"
++"Settlers of Catan board game.\n"
++msgstr ""
++"Pioneers æ?¯å?¨ä¼?ç§?ç??æ¡?æ¸¸å?¡å?¦å²?(Settlers of Catan)\n"
++"ç??å?ºç¡?ä¸?å»ºç«?èµ·æ?¥ç??ã??\n"
++
++#: ../common/gtk/aboutbox.c:79
++msgid "Version:"
++msgstr "ç??æ?¬ï¼?"
++
++#: ../common/gtk/aboutbox.c:85
++msgid "Homepage:"
++msgstr "ä¸»é¡µï¼?"
++
++#: ../common/gtk/aboutbox.c:90
++msgid "Authors:"
++msgstr "ä½?è??ï¼?"
++
++#. Translators: add your name here. Keep the list alphabetically,
++#. * do not remove any names, and add \n after your name (except the last name).
++#.
++#: ../common/gtk/aboutbox.c:104 ../common/gtk/aboutbox.c:115
++msgid "translator_credits"
++msgstr "Gerald <gera2ld@163.com>"
++
++#. Header for the translator_credits. Use your own language name
++#: ../common/gtk/aboutbox.c:110
++msgid "Pioneers is translated to <your language here> by:\n"
++msgstr "Pioneers ä¸æ??ç¿»è¯?è??ï¼?\n"
++
++#. Caption for result of checking victory points
++#: ../common/gtk/common_gtk.c:321
++msgid "Victory Point Analysis"
++msgstr "è??å?©ç?¹å??æ??"
++
++#. Tooltip for sevens rule normal
++#: ../common/gtk/game-rules.c:99
++msgid "All sevens move the robber or pirate"
++msgstr "æ??æ??ç??7ç§»å?¨å¼ºç??æ??æµ·ç??"
++
++#. Tooltip for sevens rule reroll on 1st 2 turns
++#: ../common/gtk/game-rules.c:103
++msgid "In the first two turns all sevens are rerolled"
++msgstr "å??ä¸¤å??å??æ??æ??ç??7é?½é??æ??"
++
++#. Tooltip for sevens rule reroll all
++#: ../common/gtk/game-rules.c:107
++msgid "All sevens are rerolled"
++msgstr "æ??æ??ç??7é?½é??æ??"
++
++#: ../common/gtk/game-rules.c:118
++msgid "Randomize terrain"
++msgstr "é??æ?ºå?°å½¢"
++
++#: ../common/gtk/game-rules.c:118
++msgid "Randomize the terrain"
++msgstr "å?°å½¢é??æ?ºå??"
++
++#: ../common/gtk/game-rules.c:121
++msgid "Use pirate"
++msgstr "ä½¿ç?¨æµ·ç??"
++
++#: ../common/gtk/game-rules.c:122
++msgid "Use the pirate to block ships"
++msgstr "ä½¿ç?¨æµ·ç??é?»æ¢è?¹å?ª"
++
++#: ../common/gtk/game-rules.c:124
++msgid "Strict trade"
++msgstr "ä¸¥æ ¼äº¤æ??"
++
++#: ../common/gtk/game-rules.c:125
++msgid "Allow trade only before building or buying"
++msgstr "å?ªå??è®¸å?¨å»ºç?æ??è??è´ä¹°ä¹?å??è¿?è¡?äº¤æ??"
++
++#: ../common/gtk/game-rules.c:127
++msgid "Domestic trade"
++msgstr "å??é?¨äº¤æ??"
++
++#: ../common/gtk/game-rules.c:128
++msgid "Allow trade between players"
++msgstr "å??è®¸ç?©å®¶ä¹?é?´äº¤æ??"
++
++#: ../common/gtk/game-rules.c:130
++msgid "Victory at end of turn"
++msgstr "å??å??ç»?æ??å??å?¤æ?è??å?©æ?¡ä»¶"
++
++#: ../common/gtk/game-rules.c:131
++msgid "Check for victory only at end of turn"
++msgstr "ä»?å?¨å??å??ç»?æ??æ?¶æ£?æµ?æ?¯å?¦è??å?©"
++
++#. Label
++#: ../common/gtk/game-rules.c:135
++msgid "Island discovery bonuses"
++msgstr "å??ç?°å²?å±¿ç??å¥?å?±"
++
++#. Tooltip for island bonus
++#: ../common/gtk/game-rules.c:147
++msgid "A comma separated list of bonus points for discovering islands"
++msgstr "ä¸?ä¸ªé??å?·é??å¼?ç??å??è¡¨ï¼?è¡¨ç¤ºå??ç?°å²?å±¿ç??å¥?å?±ç?¹æ?°"
++
++#. Tooltip for the check button
++#: ../common/gtk/game-rules.c:165
++msgid "Check and correct island discovery bonuses"
++msgstr "æ£?æ?¥å¹¶ä¿®æ£å??ç?°å²?å±¿ç??å¥?å?±"
++
++#. Label text for customising a game
++#: ../common/gtk/game-settings.c:106
++msgid "Number of players"
++msgstr "ç?©å®¶æ?°ç?®"
++
++#. Tooltip for 'Number of Players'
++#: ../common/gtk/game-settings.c:125
++msgid "The number of players"
++msgstr "ç?©å®¶æ?°ç?®"
++
++#. Label for customising a game
++#: ../common/gtk/game-settings.c:128
++msgid "Victory point target"
++msgstr "ç?®æ ?è??å?©å??æ?°"
++
++#. Tooltip for Victory Point Target
++#: ../common/gtk/game-settings.c:148
++msgid "The points needed to win the game"
++msgstr "æ¸¸æ??è??å?©è¿?é??è¦?ç??ç?¹æ?°"
++
++#. Tooltip for the check button
++#: ../common/gtk/game-settings.c:162
++msgid "Is it possible to win this game?"
++msgstr "è¿?å?ºæ¸¸æ??è¿?æ??å?¯è?½èµ¢å??ï¼?"
++
++#. Port indicator for a resource: trade 2 for 1
++#: ../common/gtk/guimap.c:845
++msgid "2:1"
++msgstr "2:1"
++
++#. Port indicator: trade 3 for 1
++#. General port indicator
++#: ../common/gtk/guimap.c:848 ../common/gtk/guimap.c:873
++msgid "3:1"
++msgstr "3:1"
++
++#. Port indicator for brick
++#: ../common/gtk/guimap.c:853
++msgid "Brick port|B"
++msgstr "ç ?"
++
++#. Port indicator for grain
++#: ../common/gtk/guimap.c:857
++msgid "Grain port|G"
++msgstr "éº¦"
++
++#. Port indicator for ore
++#: ../common/gtk/guimap.c:861
++msgid "Ore port|O"
++msgstr "ç?¿"
++
++#. Port indicator for wool
++#: ../common/gtk/guimap.c:865
++msgid "Wool port|W"
++msgstr "ç¾?"
++
++#. Port indicator for lumber
++#: ../common/gtk/guimap.c:869
++msgid "Lumber port|L"
++msgstr "å??"
++
++#. Tooltip for the list of meta servers
++#: ../common/gtk/metaserver.c:86
++msgid "Select a metaserver"
++msgstr "é??æ?©ä¸?ä¸ªä¸è½¬æ??å?¡å?¨"
++
++#. Tooltip for the list of games
++#: ../common/gtk/select-game.c:104
++msgid "Select a game"
++msgstr "é??æ?©ä¸?ä¸ªæ¸¸æ??"
++
++#. Log prefix
++#: ../common/log.c:55
++msgid "*ERROR* "
++msgstr "*é??è¯¯* "
++
++#. Log prefix
++#: ../common/log.c:63
++msgid "Chat: "
++msgstr "è??å¤©ï¼?"
++
++#. Log prefix
++#: ../common/log.c:67
++msgid "Resource: "
++msgstr "èµ?æº?ï¼?"
++
++#. Log prefix
++#: ../common/log.c:71
++msgid "Build: "
++msgstr "å»ºç?ï¼?"
++
++#. Log prefix
++#: ../common/log.c:75
++msgid "Dice: "
++msgstr "éª°å?ï¼?"
++
++#. Log prefix
++#: ../common/log.c:79
++msgid "Steal: "
++msgstr "å?·å??ï¼?"
++
++#. Log prefix
++#: ../common/log.c:83
++msgid "Trade: "
++msgstr "äº¤æ??ï¼?"
++
++#. Log prefix
++#: ../common/log.c:87
++msgid "Development: "
++msgstr "å??å±?å?¡ï¼?"
++
++#. Log prefix
++#: ../common/log.c:91
++msgid "Army: "
++msgstr "å??é??ï¼?"
++
++#. Log prefix
++#: ../common/log.c:95
++msgid "Road: "
++msgstr "é??è·¯ï¼?"
++
++#. Log prefix
++#: ../common/log.c:99
++msgid "*BEEP* "
++msgstr "*å??ä¸?ä¸?* "
++
++#. Log prefix
++#: ../common/log.c:105
++msgid "Player 1: "
++msgstr "ç?©å®¶ 1ï¼?"
++
++#. Log prefix
++#: ../common/log.c:109
++msgid "Player 2: "
++msgstr "ç?©å®¶ 2ï¼?"
++
++#. Log prefix
++#: ../common/log.c:113
++msgid "Player 3: "
++msgstr "ç?©å®¶ 3ï¼?"
++
++#. Log prefix
++#: ../common/log.c:117
++msgid "Player 4: "
++msgstr "ç?©å®¶ 4ï¼?"
++
++#. Log prefix
++#: ../common/log.c:121
++msgid "Player 5: "
++msgstr "ç?©å®¶ 5ï¼?"
++
++#. Log prefix
++#: ../common/log.c:125
++msgid "Player 6: "
++msgstr "ç?©å®¶ 6ï¼?"
++
++#. Log prefix
++#: ../common/log.c:129
++msgid "Player 7: "
++msgstr "ç?©å®¶ 7ï¼?"
++
++#. Log prefix
++#: ../common/log.c:133
++msgid "Player 8: "
++msgstr "ç?©å®¶ 8ï¼?"
++
++#. Log prefix
++#: ../common/log.c:137
++msgid "Spectator: "
++msgstr "è§?ä¼?ï¼?"
++
++#. Log prefix
++#: ../common/log.c:141
++msgid "** UNKNOWN MESSAGE TYPE ** "
++msgstr "** æ?ªç?¥ç??æ¶?æ?¯ç±»å?? ** "
++
++#: ../common/network.c:315
++#, c-format
++msgid "Error checking connect status: %s\n"
++msgstr "Error checking connect status: %s\n"
++
++#: ../common/network.c:333
++#, c-format
++msgid "Error connecting to host '%s': %s\n"
++msgstr "Error connecting to host '%s': %s\n"
++
++#: ../common/network.c:360
++#, c-format
++msgid "Error writing socket: %s\n"
++msgstr "Error writing socket: %s\n"
++
++#: ../common/network.c:411
++#, c-format
++msgid "Error writing to socket: %s\n"
++msgstr "å??å?°socketæ?¶å??ç??é??è¯¯: %s\n"
++
++#: ../common/network.c:465
++msgid "Read buffer overflow - disconnecting\n"
++msgstr "è¯»ç¼?å?æ?¶æº¢å?º - æ?å¼?è¿?æ?¥\n"
++
++#: ../common/network.c:475
++#, c-format
++msgid "Error reading socket: %s\n"
++msgstr "è¯»socketé??è¯¯ï¼?%s\n"
++
++#: ../common/network.c:618
++#, c-format
++msgid "Error creating socket: %s\n"
++msgstr "Error creating socket: %s\n"
++
++#: ../common/network.c:625
++#, c-format
++msgid "Error setting socket close-on-exec: %s\n"
++msgstr "Error setting socket close-on-exec: %s\n"
++
++#: ../common/network.c:634 ../common/network.c:830
++#, c-format
++msgid "Error setting socket non-blocking: %s\n"
++msgstr "Error setting socket non-blocking: %s\n"
++
++#: ../common/network.c:657
++#, c-format
++msgid "Error connecting to %s: %s\n"
++msgstr "è¿?æ?¥å?°%så??ç??é??è¯¯ï¼?%s\n"
++
++#: ../common/network.c:695
++#, c-format
++msgid "Cannot resolve %s port %s: %s\n"
++msgstr "Cannot resolve %s port %s: %s\n"
++
++#: ../common/network.c:701
++#, c-format
++msgid "Cannot resolve %s port %s: host not found\n"
++msgstr "Cannot resolve %s port %s: host not found\n"
++
++#: ../common/network.c:789
++#, c-format
++msgid "Error creating struct addrinfo: %s"
++msgstr "Error creating struct addrinfo: %s"
++
++#: ../common/network.c:819
++#, c-format
++msgid "Error creating listening socket: %s\n"
++msgstr "Error creating listening socket: %s\n"
++
++#: ../common/network.c:839
++#, c-format
++msgid "Error during listen on socket: %s\n"
++msgstr "Error during listen on socket: %s\n"
++
++#: ../common/network.c:849
++msgid "Listening not yet supported on this platform."
++msgstr "Listening not yet supported on this platform."
++
++#: ../common/network.c:871 ../common/network.c:872
++msgid "unknown"
++msgstr "æ?ªç?¥"
++
++#: ../common/network.c:878
++#, c-format
++msgid "Error getting peer name: %s"
++msgstr "Error getting peer name: %s"
++
++#: ../common/network.c:890
++#, c-format
++msgid "Error resolving address: %s"
++msgstr "Error resolving address: %s"
++
++#: ../common/network.c:904
++msgid "Net_get_peer_name not yet supported on this platform."
++msgstr "Net_get_peer_name not yet supported on this platform."
++
++#: ../common/network.c:920
++#, c-format
++msgid "Error accepting connection: %s"
++msgstr "Error accepting connection: %s"
++
++#: ../common/state.c:168
++#, c-format
++msgid "Connecting to %s, port %s\n"
++msgstr "è¿?æ?¥å?° %s:%s\n"
++
++#. Error message
++#: ../common/state.c:291
++msgid "State stack overflow. Stack dump sent to standard error.\n"
++msgstr "Stateæ ?æº¢å?ºã??æ ?å ?å·²å??é??å?°æ ?å??é??è¯¯ã??\n"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:90
++msgid "_Hill"
++msgstr "å°?å±±(_H)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:92
++msgid "_Field"
++msgstr "ç?°é??(_F)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:94
++msgid "_Mountain"
++msgstr "å¤§å±±(_M)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:96
++msgid "_Pasture"
++msgstr "è??å??(_P)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:98
++msgid "F_orest"
++msgstr "æ£®æ??(_O)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:100
++msgid "_Desert"
++msgstr "æ²?æ¼ (_D)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:102
++msgid "_Sea"
++msgstr "å¤§æµ·(_S)"
++
++#. Use an unique shortcut key for each resource
++#: ../editor/gtk/editor.c:104
++msgid "_Gold"
++msgstr "é»?é??(_G)"
++
++#. Use an unique shortcut key for each resource
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:106 ../editor/gtk/editor.c:121
++msgid "_None"
++msgstr "æ? (_N)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:111
++msgid "_Brick (2:1)"
++msgstr "ç ?å¤´(_B) (2:1)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:113
++msgid "_Grain (2:1)"
++msgstr "éº¦å?(_G) (2:1)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:115
++msgid "_Ore (2:1)"
++msgstr "ç?¿ç?³(_O) (2:1)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:117
++msgid "_Wool (2:1)"
++msgstr "ç¾?æ¯?(_W) (2:1)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:119
++msgid "_Lumber (2:1)"
++msgstr "å??æ?¨(_L) (2:1)"
++
++#. Use an unique shortcut key for each port type
++#: ../editor/gtk/editor.c:123
++msgid "_Any (3:1)"
++msgstr "ä»»æ??(_A) (3:1)"
++
++#. East
++#: ../editor/gtk/editor.c:128
++msgid "East|E"
++msgstr "ä¸?"
++
++#. North east
++#: ../editor/gtk/editor.c:130
++msgid "North East|NE"
++msgstr "ä¸?å??"
++
++#. North west
++#: ../editor/gtk/editor.c:132
++msgid "North West|NW"
++msgstr "è¥¿å??"
++
++#. West
++#: ../editor/gtk/editor.c:134
++msgid "West|W"
++msgstr "è¥¿"
++
++#. South west
++#: ../editor/gtk/editor.c:136
++msgid "South West|SW"
++msgstr "è¥¿å??"
++
++#. South east
++#: ../editor/gtk/editor.c:138
++msgid "South East|SE"
++msgstr "ä¸?å??"
++
++#: ../editor/gtk/editor.c:230
++msgid "Insert a row"
++msgstr "æ??å?¥ä¸?è¡?"
++
++#: ../editor/gtk/editor.c:231
++msgid "Delete a row"
++msgstr "å? é?¤ä¸?è¡?"
++
++#: ../editor/gtk/editor.c:232
++msgid "Insert a column"
++msgstr "æ??å?¥ä¸?å??"
++
++#: ../editor/gtk/editor.c:233
++msgid "Delete a column"
++msgstr "å? é?¤ä¸?å??"
++
++#. Menu item
++#: ../editor/gtk/editor.c:732
++msgid "Shuffle"
++msgstr "æ??ä¹±"
++
++#. Caption
++#. Game settings frame
++#: ../editor/gtk/editor.c:884 ../server/gtk/main.c:943
++msgid "Game parameters"
++msgstr "æ¸¸æ??å??æ?°"
++
++#. Caption
++#. Rules frame
++#: ../editor/gtk/editor.c:887 ../server/gtk/main.c:958
++msgid "Rules"
++msgstr "è§?å??"
++
++#. Caption
++#: ../editor/gtk/editor.c:889
++msgid "Resources"
++msgstr "èµ?æº?"
++
++#. Caption
++#: ../editor/gtk/editor.c:892
++msgid "Buildings"
++msgstr "å»ºç?"
++
++#. Application caption
++#: ../editor/gtk/editor.c:913 ../editor/gtk/pioneers-editor.desktop.in.h:1
++msgid "Pioneers Editor"
++msgstr "Pioneersç¼?è¾?å?¨"
++
++#: ../editor/gtk/editor.c:1015
++#, c-format
++msgid "Failed to load '%s'"
++msgstr "æ??å¼?â??%sâ??å¤±è´¥"
++
++#: ../editor/gtk/editor.c:1063
++#, c-format
++msgid "Failed to save to '%s'"
++msgstr "ä¿?å?å?°'%s'å¤±è´¥"
++
++#. Name of the file filter: show only games
++#: ../editor/gtk/editor.c:1080
++msgid "Games"
++msgstr "æ¸¸æ??"
++
++#. Name of the file filter: show all files
++#: ../editor/gtk/editor.c:1086
++msgid "Unfiltered"
++msgstr "æ??æ??"
++
++#. Dialog caption
++#: ../editor/gtk/editor.c:1098
++msgid "Open Game"
++msgstr "æ??å¼?æ¸¸æ??"
++
++#. Dialog caption
++#: ../editor/gtk/editor.c:1137
++msgid "Save As..."
++msgstr "å?¦å?ä¸º..."
++
++#. Dialog caption
++#: ../editor/gtk/editor.c:1183
++msgid "Change Title"
++msgstr "ä¿®æ?¹å??ç§°"
++
++#. Label
++#: ../editor/gtk/editor.c:1206
++msgid "New title:"
++msgstr "æ?°å??ç§°ï¼?"
++
++#. About dialog caption
++#: ../editor/gtk/editor.c:1264
++msgid "About Pioneers Game Editor"
++msgstr "å?³äº?Pioneersæ¸¸æ??ç¼?è¾?å?¨"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1294
++msgid "_File"
++msgstr "æ??ä»¶(_F)"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1304
++msgid "_New"
++msgstr "æ?°å»º(_N)"
++
++#: ../editor/gtk/editor.c:1305
++msgid "Create a new game"
++msgstr "å??å»ºä¸?ä¸ªæ?°æ¸¸æ??"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1308
++msgid "_Open..."
++msgstr "æ??å¼?(_O)..."
++
++#. Tooltip for Open menu entry
++#: ../editor/gtk/editor.c:1310
++msgid "Open an existing game"
++msgstr "æ??å¼?ä¸?ä¸ªç?°æ??ç??æ¸¸æ??"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1313
++msgid "_Save"
++msgstr "ä¿?å?(_S)"
++
++#. Tooltip for Save menu entry
++#: ../editor/gtk/editor.c:1315
++msgid "Save game"
++msgstr "ä¿?å?æ¸¸æ??"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1318
++msgid "Save _As..."
++msgstr "å?¦å?ä¸º(_A)..."
++
++#. Tooltip for Save As menu entry
++#: ../editor/gtk/editor.c:1321
++msgid "Save as"
++msgstr "å?¦å?ä¸º"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1324
++msgid "_Change Title"
++msgstr "ä¿®æ?¹å??ç§°(_T)"
++
++#. Tooltip for Change Title menu entry
++#: ../editor/gtk/editor.c:1326
++msgid "Change game title"
++msgstr "ä¿®æ?¹æ¸¸æ??å??ç§°"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1329 ../server/gtk/main.c:98
++msgid "_Check Victory Point Target"
++msgstr "æ£?æµ?ç?®æ ?è??å?©å??æ?°(_C)"
++
++#. Tooltip for Check Victory Point Target menu entry
++#. Tooltop for Check Victory Point Target menu entry
++#: ../editor/gtk/editor.c:1332 ../server/gtk/main.c:101
++msgid "Check whether the game can be won"
++msgstr "æ£?æµ?æ¸¸æ??æ?¯å?¦å?¯è?½èµ¢"
++
++#. Tooltip for Quit menu entry
++#: ../editor/gtk/editor.c:1337
++msgid "Quit"
++msgstr "é??å?º"
++
++#. Menu entry
++#: ../editor/gtk/editor.c:1359
++msgid "_About Pioneers Editor"
++msgstr "å?³äº?Pioneersç¼?è¾?å?¨(_A)"
++
++#. Tooltip for About Pioneers Editor menu entry
++#: ../editor/gtk/editor.c:1361
++msgid "Information about Pioneers Editor"
++msgstr "å?³äº?Pioneersç¼?è¾?å?¨ç??ä¿¡æ?¯"
++
++#. Long help for commandline option (editor): filename
++#: ../editor/gtk/editor.c:1414
++msgid "Open this file"
++msgstr "æ??å¼?è¿?ä¸ªæ??ä»¶"
++
++#. Commandline option for editor: filename
++#. Commandline meta-server: pidfile argument
++#: ../editor/gtk/editor.c:1416 ../meta-server/main.c:1074
++msgid "filename"
++msgstr "æ??ä»¶å??"
++
++#. Long description in the command line: --help
++#: ../editor/gtk/editor.c:1451
++msgid "- Editor for games of Pioneers"
++msgstr "- Pioneersæ¸¸æ??ç¼?è¾?å?¨"
++
++#. Error message
++#: ../editor/gtk/editor.c:1495 ../server/gtk/main.c:1216
++#, c-format
++msgid "Building menus failed: %s"
++msgstr "å??å»ºè??å??å¤±è´¥ï¼?%s"
++
++#. Tab page name
++#: ../editor/gtk/editor.c:1525
++msgid "Settings"
++msgstr "è®¾ç½®"
++
++#. Tab page name
++#: ../editor/gtk/editor.c:1528
++msgid "Comments"
++msgstr "è¯?è®º"
++
++#: ../editor/gtk/game-resources.c:48
++msgid "Resource count"
++msgstr "èµ?æº?æ?°"
++
++#: ../editor/gtk/pioneers-editor.desktop.in.h:2
++msgid "Create your own game for Pioneers"
++msgstr "ä¸ºPioneerså??å»ºä½ è?ªå·±ç??æ¸¸æ??"
++
++#. Commandline meta-server: daemon
++#: ../meta-server/main.c:1069
++msgid "Daemonize the metaserver on start"
++msgstr "å?¯å?¨æ?¶å??å?°è¿?è¡?ä¸è½¬æ??å?¡å?¨"
++
++#. Commandline meta-server: pidfile
++#: ../meta-server/main.c:1072
++msgid "Pidfile to create when daemonizing (implies -d)"
++msgstr "å®?æ?¤æ?¶å??å»ºç??Pidæ??ä»¶ï¼?ç?¸å½?äº?-dï¼?"
++
++#. Commandline meta-server: redirect
++#: ../meta-server/main.c:1077
++msgid "Redirect clients to another metaserver"
++msgstr "é??å®?å??å®¢æ?·ç«¯å?°å?¦ä¸?ä¸ªä¸è½¬æ??å?¡å?¨"
++
++#. Commandline meta-server: server
++#: ../meta-server/main.c:1080
++msgid "Use this hostname when creating new games"
++msgstr "å??å»ºæ?°æ¸¸æ??æ?¶ä½¿ç?¨è¿?ä¸ªä¸»æ?ºå??"
++
++#. Commandline meta-server: server argument
++#: ../meta-server/main.c:1082
++msgid "hostname"
++msgstr "ä¸»æ?ºå??"
++
++#. Commandline meta-server: port-range
++#: ../meta-server/main.c:1085
++msgid "Use this port range when creating new games"
++msgstr "å??å»ºæ?°æ¸¸æ??æ?¶ä½¿ç?¨è¿?ä¸ªè??å?´å??ç??ç«¯å?£"
++
++#. Commandline meta-server: port-range argument
++#: ../meta-server/main.c:1087
++msgid "from-to"
++msgstr "ä»?-å?°"
++
++#. Commandline option of meta server: syslog-debug
++#: ../meta-server/main.c:1093
++msgid "Debug syslog messages"
++msgstr "è°?è¯?ç³»ç»?æ?¥å¿?æ¶?æ?¯"
++
++#. Long description in the commandline for server-console: help
++#: ../meta-server/main.c:1119
++msgid "- Metaserver for Pioneers"
++msgstr "- Pioneersç??ä¸è½¬æ??å?¡å?¨"
++
++#: ../meta-server/main.c:1135
++#, c-format
++msgid "metaserver protocol:"
++msgstr "ä¸è½¬æ??å?¡å?¨å??è®®ï¼?"
++
++#: ../server/avahi.c:68
++msgid "Avahi registration successful.\n"
++msgstr "Avahiæ³¨å??æ??å??ã??\n"
++
++#: ../server/avahi.c:78
++#, c-format
++msgid "Avahi service name collision, renaming service to '%s'.\n"
++msgstr "Avahiæ??å?¡å??å?²çª?ï¼?é??å?½å??æ??'%s'ã??\n"
++
++#. Some kind of failure happened while we were registering
++#: ../server/avahi.c:89
++#, c-format
++msgid "Avahi error: %s\n"
++msgstr "Avahié??è¯¯ï¼?%s\n"
++
++#: ../server/avahi.c:113 ../server/avahi.c:147 ../server/avahi.c:157
++#: ../server/avahi.c:193 ../server/avahi.c:214 ../server/avahi.c:228
++#, c-format
++msgid "Avahi error: %s, %s\n"
++msgstr "Avahié??è¯¯ï¼?%sï¼?%s\n"
++
++#: ../server/avahi.c:215 ../server/avahi.c:229
++msgid "Unable to register Avahi server"
++msgstr "æ? æ³?æ³¨å??Avahiæ??å?¡å?¨"
++
++#: ../server/avahi.c:262
++msgid "Unregistering Avahi.\n"
++msgstr "å??æ¶?æ³¨å??Avahiã??\n"
++
++#. Menu entry
++#: ../server/gtk/main.c:109
++msgid "_About Pioneers Server"
++msgstr "å?³äº?Pioneersæ??å?¡å?¨(_A)"
++
++#. Tooltop for About Pioneers Server menu entry
++#: ../server/gtk/main.c:111
++msgid "Information about Pioneers Server"
++msgstr "å?³äº?Pioneersæ??å?¡å?¨ç??ä¿¡æ?¯"
++
++#: ../server/gtk/main.c:229
++msgid "Stop Server"
++msgstr "å??æ¢æ??å?¡å?¨"
++
++#: ../server/gtk/main.c:230
++msgid "Start Server"
++msgstr "å?¯å?¨æ??å?¡å?¨"
++
++#: ../server/gtk/main.c:232 ../server/gtk/main.c:971
++msgid "Stop the server"
++msgstr "å??æ¢æ??å?¡å?¨"
++
++#: ../server/gtk/main.c:233
++msgid "Start the server"
++msgstr "å?¯å?¨æ??å?¡å?¨"
++
++#: ../server/gtk/main.c:373
++#, c-format
++msgid "Player %s from %s entered\n"
++msgstr "ç?©å®¶ %s æ?¥è?ª %s è¿?å?¥äº?\n"
++
++#: ../server/gtk/main.c:380
++#, c-format
++msgid "Player %s from %s left\n"
++msgstr "ç?©å®¶ %s æ?¥è?ª %s ç¦»å¼?äº?\n"
++
++#: ../server/gtk/main.c:387
++#, c-format
++msgid "Player %d is now %s\n"
++msgstr "ç?©å®¶ %d ç?°å?¨å?« %s\n"
++
++#: ../server/gtk/main.c:546
++msgid "The port for the game server"
++msgstr "æ¸¸æ??æ??å?¡å?¨ç??ç«¯å?£"
++
++#. register_toggle
++#: ../server/gtk/main.c:555
++msgid "Register server"
++msgstr "æ³¨å??æ??å?¡å?¨"
++
++#: ../server/gtk/main.c:563
++msgid "Register this game at the metaserver"
++msgstr "å?¨ä¸è½¬æ??å?¡å?¨æ³¨å??è¿?ä¸ªæ¸¸æ??"
++
++#. hostname label
++#: ../server/gtk/main.c:595
++msgid "Reported hostname"
++msgstr "å??æ?¥ç??ä¸»æ?ºå??"
++
++#: ../server/gtk/main.c:610
++msgid ""
++"The public name of this computer (needed when playing behind a firewall)"
++msgstr "è¿?å?°è®¡ç®?æ?ºç??å?¬å¼?å??ç§°ï¼?å?¨é?²ç?«å¢?å??æ¸¸æ??æ?¶é??è¦?ï¼?"
++
++#. random toggle
++#: ../server/gtk/main.c:629
++msgid "Random turn order"
++msgstr "é??æ?ºé¡ºåº?"
++
++#: ../server/gtk/main.c:636
++msgid "Randomize turn order"
++msgstr "æ??ä¹±æ¸¸æ??é¡ºåº?"
++
++#. Tooltip for server connection overview
++#: ../server/gtk/main.c:707
++msgid "Shows all players and spectators connected to the server"
++msgstr "æ?¾ç¤ºè¿?æ?¥å?°æ??å?¡å?¨ç??æ??æ??ç?©å®¶å??è§?ä¼?"
++
++#. Label for column Connected
++#: ../server/gtk/main.c:712
++msgid "Connected"
++msgstr "å·²è¿?æ?¥"
++
++#. Tooltip for column Connected
++#: ../server/gtk/main.c:719
++msgid "Is the player currently connected?"
++msgstr "ç?©å®¶ç?°å?¨å·²è¿?æ?¥ï¼?"
++
++#. Label for column Name
++#: ../server/gtk/main.c:724
++msgid "Name"
++msgstr "å??å?"
++
++#. Tooltip for column Name
++#: ../server/gtk/main.c:731
++msgid "Name of the player"
++msgstr "ç?©å®¶å§?å??"
++
++#. Label for column Location
++#: ../server/gtk/main.c:735
++msgid "Location"
++msgstr "ä½?ç½®"
++
++#. Tooltip for column Location
++#: ../server/gtk/main.c:742
++msgid "Host name of the player"
++msgstr "ç?©å®¶ä¸»æ?ºå??"
++
++#. Label for column Number
++#: ../server/gtk/main.c:748
++msgid "Number"
++msgstr "ç¼?å?·"
++
++#. Tooltip for column Number
++#: ../server/gtk/main.c:755
++msgid "Player number"
++msgstr "ç?©å®¶ç¼?å?·"
++
++#. Label for column Role
++#: ../server/gtk/main.c:761
++msgid "Role"
++msgstr "è§?è?²"
++
++#. Tooltip for column Role
++#: ../server/gtk/main.c:765
++msgid "Player or spectator"
++msgstr "ç?©å®¶æ??è§?ä¼?"
++
++#. Button text
++#: ../server/gtk/main.c:801
++msgid "Launch Pioneers Client"
++msgstr "å?¯å?¨Pioneerså®¢æ?·ç«¯"
++
++#. Tooltip
++#: ../server/gtk/main.c:809
++msgid "Launch the Pioneers client"
++msgstr "å?¯å?¨Pioneerså®¢æ?·ç«¯"
++
++#. ai chat toggle
++#: ../server/gtk/main.c:843
++msgid "Enable chat"
++msgstr "å?¯ç?¨è??å¤©"
++
++#. Tooltip
++#: ../server/gtk/main.c:850
++msgid "Enable chat messages"
++msgstr "å?¯ç?¨è??å¤©æ¶?æ?¯"
++
++#. Button text
++#: ../server/gtk/main.c:859
++msgid "Add Computer Player"
++msgstr "æ·»å? ç?µè??ç?©å®¶"
++
++#. Tooltip
++#: ../server/gtk/main.c:867
++msgid "Add a computer player to the game"
++msgstr "æ·»å? ä¸?ä¸ªç?µè??ç?©å®¶å?°æ¸¸æ??ä¸"
++
++#. Tooltip
++#: ../server/gtk/main.c:900
++msgid "Messages from the server"
++msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ¶?æ?¯"
++
++#: ../server/gtk/main.c:936
++msgid "Game settings"
++msgstr "æ¸¸æ??è®¾ç½®"
++
++#. server frame
++#: ../server/gtk/main.c:947
++msgid "Server parameters"
++msgstr "æ??å?¡å?¨å??æ?°"
++
++#: ../server/gtk/main.c:967
++msgid "Running game"
++msgstr "æ¸¸æ??æ£å?¨è¿?è¡?"
++
++#. player connected frame
++#: ../server/gtk/main.c:983
++msgid "Players connected"
++msgstr "å·²è¿?æ?¥ç??ç?©å®¶"
++
++#. ai frame
++#: ../server/gtk/main.c:987
++msgid "Computer players"
++msgstr "ç?µè??ç?©å®¶"
++
++#. message frame
++#: ../server/gtk/main.c:999
++msgid "Messages"
++msgstr "æ¶?æ?¯"
++
++#. Dialog caption of about box
++#: ../server/gtk/main.c:1110
++msgid "The Pioneers Game Server"
++msgstr "Pioneersæ¸¸æ??æ??å?¡å?¨"
++
++#. Wait for all players to disconnect,
++#. * then enable the UI
++#.
++#: ../server/gtk/main.c:1118
++msgid "The game is over.\n"
++msgstr "æ¸¸æ??å·²ç»?æ??ã??\n"
++
++#. Long description in the commandline for server-gtk: help
++#. Long description in the commandline for server-console: help
++#: ../server/gtk/main.c:1172 ../server/main.c:176
++msgid "- Host a game of Pioneers"
++msgstr "- Pioneersç??ä¸?ä¸ªæ¸¸æ??ä¸»æ?º"
++
++#. Name in the titlebar of the server
++#: ../server/gtk/main.c:1196 ../server/gtk/pioneers-server.desktop.in.h:1
++msgid "Pioneers Server"
++msgstr "Pioneersæ??å?¡å?¨"
++
++#: ../server/gtk/pioneers-server.desktop.in.h:2
++msgid "Host a game of Pioneers"
++msgstr "ä¸?ä¸ªPioneersæ¸¸æ??ç??ä¸»æ?º"
++
++#. Commandline server-console: game-title
++#: ../server/main.c:76
++msgid "Game title to use"
++msgstr "ä½¿ç?¨ç??æ¸¸æ??å??ç§°"
++
++#. Commandline server-console: file
++#: ../server/main.c:79
++msgid "Game file to use"
++msgstr "ä½¿ç?¨ç??æ¸¸æ??æ??ä»¶"
++
++#. Commandline server-console: port
++#: ../server/main.c:82
++msgid "Port to listen on"
++msgstr "ç??å?¬ç??ç«¯å?£"
++
++#. Commandline server-console: players
++#: ../server/main.c:85
++msgid "Override number of players"
++msgstr "é??ç½®ç?©å®¶æ?°ç?®"
++
++#. Commandline server-console: points
++#: ../server/main.c:88
++msgid "Override number of points needed to win"
++msgstr "é??ç½®è??å?©æ??é??ç??å??æ?°"
++
++#. Commandline server-console: seven-rule
++#: ../server/main.c:91
++msgid "Override seven-rule handling"
++msgstr "é??ç½®æ??7ç??è§?å??å¤?ç??"
++
++#. Commandline server-console: terrain
++#: ../server/main.c:94
++msgid "Override terrain type, 0=default 1=random"
++msgstr "é??ç½®å?°å½¢ç±»å??ï¼?0=é»?è®¤ 1=é??æ?º"
++
++#. Commandline server-console: computer-players
++#: ../server/main.c:97
++msgid "Add N computer players"
++msgstr "æ·»å? Nä¸ªç?µè??ç?©å®¶"
++
++#. Commandline server-console: register
++#: ../server/main.c:107
++msgid "Register server with metaserver"
++msgstr "é??è¿?ä¸è½¬æ??å?¡å?¨æ³¨å??æ??å?¡å?¨"
++
++#. Commandline server-console: meta-server
++#: ../server/main.c:110
++msgid "Register at metaserver name (implies -r)"
++msgstr "ç?¨æ?¥æ³¨å??ç??ä¸è½¬æ??å?¡å?¨å??å?ï¼?ç?¸å½?äº?-rï¼?"
++
++#. Commandline server-console: hostname
++#: ../server/main.c:114
++msgid "Use this hostname when registering"
++msgstr "æ³¨å??æ?¶ä½¿ç?¨è¿?ä¸ªä¸»æ?ºå??"
++
++#. Commandline server-console: auto-quit
++#: ../server/main.c:121
++msgid "Quit after a player has won"
++msgstr "ä¸?ä¸ªç?©å®¶è??å?©å??é??å?º"
++
++#. Commandline server-console: empty-timeout
++#: ../server/main.c:124
++msgid "Quit after N seconds with no players"
++msgstr "Nç§?å??æ²¡æ??ç?©å®¶å??é??å?º"
++
++#. Commandline server-console: tournament
++#: ../server/main.c:127
++msgid "Tournament mode, computer players added after N minutes"
++msgstr "æ¯?èµ?æ¨¡å¼?ï¼?Nå??é??å??æ·»å? ç?µè??ç?©å®¶"
++
++#. Commandline server-console: admin-port
++#: ../server/main.c:131
++msgid "Admin port to listen on"
++msgstr "ç?¨æ?¥ç??å?¬ç??ç®¡ç??ç«¯å?£"
++
++#. Commandline server-console: admin-wait
++#: ../server/main.c:134
++msgid "Don't start game immediately, wait for a command on admin port"
++msgstr "ä¸?è¦?ç«?å?³å¼?å§?æ¸¸æ??ï¼?ç?å¾?ç®¡ç??ç«¯å?£æ?¥æ?¶å?½ä»¤"
++
++#. Commandline server-console: fixed-seating-order
++#: ../server/main.c:140
++msgid "Give players numbers according to the order they enter the game"
++msgstr "æ ¹æ?®ç?©å®¶å? å?¥æ?¶ç??å?½ä»¤æ?¥å?³å®?ç?©å®¶ç¼?å?·"
++
++#. Commandline server-console: Short description of meta group
++#: ../server/main.c:182
++msgid "Metaserver Options"
++msgstr "ä¸è½¬æ??å?¡å?¨é??é¡¹"
++
++#. Commandline server-console: Long description of meta group
++#: ../server/main.c:184
++msgid "Options for the metaserver"
++msgstr "ä¸è½¬æ??å?¡å?¨é??é¡¹"
++
++#. Commandline server-console: Short description of misc group
++#: ../server/main.c:193
++msgid "Miscellaneous Options"
++msgstr "æ??é¡¹"
++
++#. Commandline server-console: Long description of misc group
++#: ../server/main.c:195
++msgid "Miscellaneous options"
++msgstr "å?¶ä»?é??é¡¹"
++
++#. server-console commandline error
++#: ../server/main.c:225
++#, c-format
++msgid "Cannot set game title and filename at the same time\n"
++msgstr "ä¸?è?½å??æ?¶è®¾ç½®æ¸¸æ??å??ç§°å??æ??ä»¶å??\n"
++
++#. server-console commandline error
++#: ../server/main.c:242
++#, c-format
++msgid "Cannot load the parameters for the game\n"
++msgstr "æ? æ³?å? è½½æ¸¸æ??å??æ?°\n"
++
++#. Error message
++#: ../server/main.c:275
++#, c-format
++msgid "The network port (%s) for the admin interface is not available.\n"
++msgstr "ç®¡ç??ç??é?¢ç??ç½?ç»?ç«¯å?£ï¼?%sï¼?ä¸?å?¯ç?¨ã??\n"
++
++#. server-console commandline error
++#: ../server/main.c:282
++#, c-format
++msgid "Admin port is not set, cannot disable game start too\n"
++msgstr "Admin port is not set, cannot disable game start too\n"
++
++#: ../server/meta.c:187
++#, c-format
++msgid "Register with metaserver at %s, port %s.\n"
++msgstr "æ³¨å??å?°ä¸è½¬æ??å?¡å?¨%sã??\n"
++
++#: ../server/meta.c:205
++msgid "Unregister from the metaserver.\n"
++msgstr "ä»?ä¸è½¬æ??å?¡å?¨å??æ¶?æ³¨å??ã??\n"
++
++#: ../server/player.c:140
++msgid "chat too long"
++msgstr "è??å¤©å??å®¹å¤ªé?¿"
++
++#: ../server/player.c:157
++msgid "name too long"
++msgstr "å??å?å¤ªé?¿"
++
++#: ../server/player.c:189
++msgid "ignoring unknown extension"
++msgstr "å¿½ç?¥æ?ªç?¥æ?©å±?"
++
++#: ../server/player.c:226 ../server/player.c:296
++msgid "The last player left, the tournament timer is reset."
++msgstr "æ??å??ä¸?ä¸ªç?©å®¶ç¦»å¼?äº?ï¼?æ¯?èµ?è®¡æ?¶å?¨è¢«é??ç½®ã??"
++
++#: ../server/player.c:260 ../server/player.c:637
++msgid "No human players present. Bye."
++msgstr "æ²¡æ??å?ºç?°äººç±»ç?©å®¶ã??ä¸?ç?©äº?ã??"
++
++#: ../server/player.c:267
++msgid "Game starts, adding computer players."
++msgstr "æ¸¸æ??å¼?å§?ï¼?æ·»å? ç?µè??ç?©å®¶ã??"
++
++#: ../server/player.c:309
++#, c-format
++msgid "The game starts in %s minutes."
++msgstr "æ¸¸æ??å°?å?¨%så??é??å??å¼?å§?ã??"
++
++#: ../server/player.c:310
++#, c-format
++msgid "The game starts in %s minute."
++msgstr "æ¸¸æ??å°?å?¨ %s å??é??å??å¼?å§?ã??"
++
++#. Default name for the AI when the computer_names file
++#. * is not found or empty.
++#.
++#: ../server/player.c:368 ../server/player.c:374
++msgid "Computer Player"
++msgstr "ç?µè??ç?©å®¶"
++
++#: ../server/player.c:469
++msgid "Sorry, game is over."
++msgstr "æ?±æ?ï¼?æ¸¸æ??å·²ç»?æ??ã??"
++
++#: ../server/player.c:472
++#, c-format
++msgid "Player from %s is refused: game is over\n"
++msgstr "æ?¥è?ª %s ç??ç?©å®¶è¢«æ??äº?ï¼?æ¸¸æ??å·²ç»?æ??\n"
++
++#: ../server/player.c:514
++msgid "Name not changed: new name is already in use"
++msgstr "å??å?æ?ªä¿®æ?¹ï¼?æ?°å??å?å·²è¢«ä½¿ç?¨"
++
++#: ../server/player.c:632 ../server/server.c:43
++msgid "Was hanging around for too long without players... bye.\n"
++msgstr "é?¿æ?¶é?´æ²¡æ??ç?©å®¶è¿?æ?¥... ä¸?ç?©äº?ã??\n"
++
++#: ../server/player.c:716
++msgid "The last human player left. Waiting for the return of a player."
++msgstr "æ??å??ä¸?ä¸ªäººç±»ç?©å®¶ç¦»å¼?äº?ã??ç?å¾?ä¸?ä¸ªç?©å®¶å??æ?¥ã??"
++
++#: ../server/player.c:737
++msgid "Resuming the game."
++msgstr "æ¸¸æ??ç»§ç»ã??"
++
++#. %s is the name of the reconnecting player
++#: ../server/player.c:868
++#, c-format
++msgid "%s has reconnected."
++msgstr "%s é??æ?°è¿?æ?¥ä¸?äº?ã??"
++
++#: ../server/player.c:973
++#, c-format
++msgid "Version mismatch: %s"
++msgstr "ç??æ?¬ä¸?å?¹é??ï¼?%s"
++
++#: ../server/player.c:1010
++msgid "This game will start soon."
++msgstr "æ¸¸æ??å?³å°?å¼?å§?ã??"
++
++#. Server: preparing game #.....
++#: ../server/server.c:236
++msgid "Preparing game"
++msgstr "å??å¤?æ¸¸æ??"
++
++#: ../server/server.c:388 ../server/server.c:477
++#, c-format
++msgid "Looking for games in '%s'\n"
++msgstr "å?¨â??%sâ??ä¸æ?¥æ?¾æ¸¸æ??\n"
++
++#: ../server/server.c:390 ../server/server.c:479
++#, c-format
++msgid "Game directory '%s' not found\n"
++msgstr "æ¸¸æ??ç?®å½?â??%sâ??æ?ªæ?¾å?°\n"
++
++#: ../server/turn.c:253
++msgid "Island Discovery Bonus"
++msgstr "å??ç?°å²?å±¿å¥?å?±"
++
++#: ../server/turn.c:254
++msgid "Additional Island Bonus"
++msgstr "é??å? å²?å±¿å¥?å?±"
++
++#: ../server/turn.c:385
++msgid "Tried to assign resources to NULL player.\n"
++msgstr "è¯?å?¾å°?èµ?æº?ç»?ä¸?ä¸ªä¸?å?å?¨ç??ç?©å®¶ã??\n"
++
++#. Cheat mode has been activated
++#: ../server/turn.c:493
++msgid "The dice roll has been determined by the administrator."
++msgstr "éª°å?è¢«ç®¡ç??å??å??å®?äº?ã??"
diff -Nru pioneers-14.1/debian/patches/svn1871_i18n_only.diff pioneers-14.1/debian/patches/svn1871_i18n_only.diff
--- pioneers-14.1/debian/patches/svn1871_i18n_only.diff	1970-01-01 01:00:00.000000000 +0100
+++ pioneers-14.1/debian/patches/svn1871_i18n_only.diff	2014-12-21 00:23:56.000000000 +0100
@@ -0,0 +1,572 @@
+Description: Fixed variants of the spelling of meta[- _]server to metaserver
+ Only the user visible string changes from svn commit 1871 have been taken.
+Author: Roland Clobus <rclobus@rclobus.nl>
+Origin: upstream
+Forwarded: not-needed
+Applied-Upstream: This is a fragment of commit 1871
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: pioneers-14.1/client/gtk/connect.c
+===================================================================
+--- pioneers-14.1.orig/client/gtk/connect.c
++++ pioneers-14.1/client/gtk/connect.c
+@@ -274,7 +274,7 @@ static void show_waiting_box(const gchar
+ 			     const gchar * port)
+ {
+ 	if (meta_dlg) {
+-		gchar *s = g_strdup_printf(_("Meta-server at %s, port %s"),
++		gchar *s = g_strdup_printf(_("Metaserver at %s, port %s"),
+ 					   server, port);
+ 		gtk_label_set_text(GTK_LABEL(server_status), s);
+ 		g_free(s);
+@@ -301,7 +301,7 @@ static void meta_gametype_notify(NetEven
+ 	case NET_CLOSE:
+ 		if (gametype_mode == GAMETYPE_MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Meta-server kicked us off\n"));
++				    _("Metaserver kicked us off\n"));
+ 		net_free(&gametype_ses);
+ 		close_waiting_box();
+ 		break;
+@@ -326,7 +326,7 @@ static void meta_gametype_notify(NetEven
+ 
+ static void get_meta_server_games_types(gchar * server, gchar * port)
+ {
+-	show_waiting_box(_("Receiving game names from the meta server.\n"),
++	show_waiting_box(_("Receiving game names from the metaserver.\n"),
+ 			 server, port);
+ 	gametype_ses = net_new(meta_gametype_notify, NULL);
+ 	if (net_connect(gametype_ses, server, port))
+@@ -351,7 +351,7 @@ static void meta_create_notify(NetEvent
+ 	case NET_CLOSE:
+ 		if (create_mode == CREATE_MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Meta-server kicked us off\n"));
++				    _("Metaserver kicked us off\n"));
+ 		net_free(&create_ses);
+ 		break;
+ 	case NET_READ:
+@@ -451,7 +451,7 @@ static void meta_notify(NetEvent event,
+ 	case NET_CLOSE:
+ 		if (meta_mode == MODE_SIGNON)
+ 			log_message(MSG_ERROR,
+-				    _("Meta-server kicked us off\n"));
++				    _("Metaserver kicked us off\n"));
+ 		close_waiting_box();
+ 		net_free(&ses);
+ 		break;
+@@ -467,7 +467,7 @@ static void meta_notify(NetEvent event,
+ 				if (metaserver_info.num_redirects++ == 10) {
+ 					log_message(MSG_INFO,
+ 						    _(""
+-						      "Too many meta-server redirects\n"));
++						      "Too many metaserver redirects\n"));
+ 					return;
+ 				}
+ 				split_result = g_strsplit(line, " ", 0);
+@@ -520,7 +520,7 @@ static void meta_notify(NetEvent event,
+ 			if (metaserver_info.version_major < 1) {
+ 				log_message(MSG_INFO,
+ 					    _(""
+-					      "Meta server too old to create "
++					      "The metaserver is too old to create "
+ 					      "servers (version %d.%d)\n"),
+ 					    metaserver_info.version_major,
+ 					    metaserver_info.version_minor);
+@@ -648,10 +648,10 @@ static void query_meta_server(const gcha
+ 	if (metaserver_info.num_redirects > 0)
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Redirected to meta-server at %s, port %s\n"),
++			      "Redirected to metaserver at %s, port %s\n"),
+ 			    server, port);
+ 	show_waiting_box(_(""
+-			   "Receiving a list of Pioneers servers from the meta server.\n"),
++			   "Receiving a list of Pioneers servers from the metaserver.\n"),
+ 			 server, port);
+ 
+ 	ses = net_new(meta_notify, NULL);
+@@ -977,7 +977,7 @@ static void create_meta_dlg(G_GNUC_UNUSE
+ 				    (GTK_DIALOG(meta_dlg), 1),
+ 				    /* Tooltip */
+ 				    _(""
+-				      "Create a new public game at the meta server"));
++				      "Create a new public game at the metaserver"));
+ 	gtk_widget_set_tooltip_text(gui_get_dialog_button
+ 				    (GTK_DIALOG(meta_dlg), 2),
+ 				    /* Tooltip */
+@@ -1326,7 +1326,7 @@ void connect_create_dlg(void)
+ #endif				// HAVE_AVAHI
+ 
+ 	/* Label */
+-	lbl = gtk_label_new(_("Meta server"));
++	lbl = gtk_label_new(_("Metaserver"));
+ 	gtk_widget_show(lbl);
+ 	gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, row, row + 1,
+ 			 GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+Index: pioneers-14.1/client/gtk/offline.c
+===================================================================
+--- pioneers-14.1.orig/client/gtk/offline.c
++++ pioneers-14.1/client/gtk/offline.c
+@@ -62,7 +62,7 @@ static GOptionEntry commandline_entries[
+ 	 N_("Connect as a spectator"), NULL},
+ 	/* Commandline option of client: hostname of the meta-server */
+ 	{"meta-server", 'm', 0, G_OPTION_ARG_STRING, &meta_server,
+-	 N_("Meta-server Host"), PIONEERS_DEFAULT_META_SERVER},
++	 N_("Metaserver Host"), PIONEERS_DEFAULT_META_SERVER},
+ 	{"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug,
+ 	 /* Commandline option of client: enable debug logging */
+ 	 N_("Enable debug messages"), NULL},
+Index: pioneers-14.1/client/help/C/pioneers.xml
+===================================================================
+--- pioneers-14.1.orig/client/help/C/pioneers.xml
++++ pioneers-14.1/client/help/C/pioneers.xml
+@@ -644,7 +644,7 @@
+ 
+ 	<para>The dialog displays a list of Pioneers games
+           that are currently running on the Internet. The default
+-	  meta server is <symbol>pioneers.debian.net</symbol></para>
++	  metaserver is <symbol>pioneers.debian.net</symbol></para>
+ 
+ 	<figure id="pioneers-FIG-servers-dialog">
+ 	  <title>The Join a public game dialog</title>
+@@ -661,7 +661,7 @@
+           one player will start the server with the game you've agreed
+           upon.</para>
+ 
+-	<para>Some meta servers also allow you to start new games
++	<para>Some metaservers also allow you to start new games
+ 	  on their host (e.g. <symbol>pioneers.game-host.org</symbol>).
+           If this is possible, the New remote game button will be active
+           and will bring you to the Create a public game dialog.</para>
+@@ -673,7 +673,7 @@
+ 
+ 	<para>In this dialog, you can select various parameters for
+ 	  the new game: board name (available types will be retrieved
+-	  from the meta-server), the number of players, victory points
++	  from the metaserver), the number of players, victory points
+ 	  to reach, how many computer players should join the game,
+           which sevens rule to apply and whether the terrain should be
+           randomized.</para>
+@@ -688,7 +688,7 @@
+       <para>Once you're satisfied with your choices, press the OK
+         button. The game will be started once enough players have
+ 	entered the game. The new game will of course be 
+-        registered to the meta server it was started from. Other players
++        registered to the metaserver it was started from. Other players
+ 	can see it in the list if they press the Join public game button,
+ 	or refresh the list of public games.</para>
+ 
+@@ -697,7 +697,7 @@
+         more than 20 minutes without any connected players. Please
+         also note that adding computer players will silently fail if the
+         <application>pioneersai</application> program is not installed
+-        on the meta server.</para>
++        on the metaserver.</para>
+ 
+       </sect2>
+ 
+@@ -1408,7 +1408,7 @@
+ 	    can find the game
+           </para></listitem>
+           <listitem><para>
+-            Select a <guilabel>Meta Server</guilabel>
++            Select a <guilabel>Metaserver</guilabel>
+           </para></listitem>
+           <listitem><para>
+             Leave <guilabel>Reported hostname</guilabel> empty
+@@ -1611,7 +1611,7 @@
+ 	      <row>
+ 	        <entry>-m</entry>
+ 		<entry>--meta-server</entry>
+-		<entry>Meta-server host</entry>
++		<entry>Metaserver host</entry>
+ 	      </row>
+ 	    </tbody>
+ 	  </tgroup>
+@@ -1653,7 +1653,7 @@
+ 	        <entry>connect</entry>
+ 	        <entry>meta-server</entry>
+ 		<entry>string</entry>
+-		<entry>Address of the meta server</entry>
++		<entry>Address of the metaserver</entry>
+ 	      </row>
+ 	      <row>
+ 	        <entry>connect</entry>
+@@ -1730,7 +1730,7 @@
+ 	    <tbody>
+ 	      <row>
+ 	        <entry>PIONEERS_META_SERVER</entry>
+-		<entry>The host name of the meta server</entry>
++		<entry>The host name of the metaserver</entry>
+ 	      </row>
+ 	    </tbody>
+ 	  </tgroup>
+@@ -1769,21 +1769,21 @@
+ 	        <entry>-r</entry>
+ 	        <entry>--register</entry>
+ 		<entry/>
+-		<entry>Register with meta-server</entry>
++		<entry>Register with metaserver</entry>
+               </row>
+ 	      <row>
+                 <entry/>
+ 	        <entry>-m</entry>
+-	        <entry>--meta-server</entry>
++	        <entry>--metaserver</entry>
+ 		<entry>string</entry>
+-		<entry>Register at meta-server name (implies -r)</entry>
++		<entry>Register at metaserver name (implies -r)</entry>
+               </row>
+ 	      <row>
+                 <entry/>
+ 	        <entry>-n</entry>
+ 	        <entry>--hostname</entry>
+ 		<entry>string</entry>
+-		<entry>Use this hostname when registering at the meta-server</entry>
++		<entry>Use this hostname when registering at the metaserver</entry>
+               </row>
+ 	      <row>
+                 <entry>*</entry>
+@@ -1902,7 +1902,7 @@
+           </tgroup>
+         </table>
+         <para>
+-          The column 'M' shows whether the switch is used by the meta-server
++          The column 'M' shows whether the switch is used by the metaserver
+         </para>
+ 	<table id="configuration-server-console-environment">
+ 	  <title><application>pioneers-server-console</application>
+@@ -1921,7 +1921,7 @@
+               </row>
+ 	      <row>
+ 	        <entry>PIONEERS_META_SERVER</entry>
+-		<entry>The host name of the meta server</entry>
++		<entry>The host name of the metaserver</entry>
+ 	      </row>
+ 	    </tbody>
+ 	  </tgroup>
+Index: pioneers-14.1/configure.ac
+===================================================================
+--- pioneers-14.1.orig/configure.ac
++++ pioneers-14.1/configure.ac
+@@ -410,7 +410,7 @@ TYPE_SOCKLEN_T
+ AC_DEFINE_UNQUOTED(PROTOCOL_VERSION, "$PROTOCOL_VERSION",
+ 		   [Protocol version used by the program])
+ AC_DEFINE_UNQUOTED(META_PROTOCOL_VERSION, "$META_PROTOCOL_VERSION",
+-		   [Protocol version used by the meta server])
++		   [Protocol version used by the metaserver])
+ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_GAME_PORT, "$PIONEERS_DEFAULT_GAME_PORT",
+ 		   [The default port for a new game])
+ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_GAME_HOST, "$PIONEERS_DEFAULT_GAME_HOST",
+@@ -418,9 +418,9 @@ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_GAME
+ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_ADMIN_PORT, "$PIONEERS_DEFAULT_ADMIN_PORT",
+ 		   [The default port for the admin interface])
+ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_META_PORT, "$PIONEERS_DEFAULT_META_PORT",
+-		   [The port for the meta server])
++		   [The port for the metaserver])
+ AC_DEFINE_UNQUOTED(PIONEERS_DEFAULT_META_SERVER, 
+-		   "$PIONEERS_DEFAULT_META_SERVER", [The default meta server])
++		   "$PIONEERS_DEFAULT_META_SERVER", [The default metaserver])
+ 
+ ## internationalization support
+ IT_PROG_INTLTOOL([0.35])
+Index: pioneers-14.1/docs/pioneers-meta-server.6
+===================================================================
+--- pioneers-14.1.orig/docs/pioneers-meta-server.6
++++ pioneers-14.1/docs/pioneers-meta-server.6
+@@ -1,6 +1,6 @@
+-.TH pioneers-meta-server 6 "January 8, 2012" "pioneers"
++.TH pioneers-meta-server 6 "February 24, 2013" "pioneers"
+ .SH NAME
+-pioneers-meta-server \- meta game server for Pioneers
++pioneers-meta-server \- metaserver for Pioneers
+ 
+ .SH SYNOPSIS
+ .B pioneers-meta-server
+@@ -30,7 +30,7 @@ Run in daemon mode.
+ 
+ .TP
+ .BI "\-r, \-\-redirect" " location"
+-.RI "Redirect to another meta-server running at " location "."
++.RI "Redirect to another metaserver running at " location "."
+ 
+ .TP
+ .BI "\-s, \-\-servername" " hostname"
+@@ -40,7 +40,7 @@ Run in daemon mode.
+ .BI "\-p, \-\-port\-range" " from" \- "to"
+ .RI "Use ports in the range " from "-" to " (inclusive) to start servers."
+ It is advised not to include port 5557 in the range.  (See BUGS below.)
+-When this range is not specified, the meta-server will not be able to create
++When this range is not specified, the metaserver will not be able to create
+ new games.
+ 
+ .TP
+@@ -56,11 +56,11 @@ Duplicate the messages of the syslog to
+ Show version information.
+ 
+ .SH ENVIRONMENT
+-The default settings of the meta-server can be influenced with the
++The default settings of the metaserver can be influenced with the
+ following three environment variables:
+ .TP 
+ .B PIONEERS_META_SERVER
+-The hostname the meta-server will use when creating new games. This should
++The hostname the metaserver will use when creating new games. This should
+ be a hostname that can be resolved by all clients that will connect.
+ .TP 
+ .B PIONEERS_SERVER_CONSOLE
+@@ -80,13 +80,13 @@ Game definitions
+ .SH SIGNALS
+ .B USR1
+ .RS
+-Shutdown the meta-server gracefully (can be used to check for memory leaks)
++Shutdown the metaserver gracefully (can be used to check for memory leaks)
+ .RE
+ 
+ .SH BUGS
+ Do not include port 5557 in the
+ .I \-\-port\-range
+-argument because the meta-server uses this port.
++argument because the metaserver uses this port.
+ 
+ .SH AUTHOR
+ This manual page was written by Jeff Breidenbach <jab@debian.org>,
+Index: pioneers-14.1/docs/pioneers-server-console.6
+===================================================================
+--- pioneers-14.1.orig/docs/pioneers-server-console.6
++++ pioneers-14.1/docs/pioneers-server-console.6
+@@ -1,4 +1,4 @@
+-.TH pioneers-server-console 6 "January 8, 2012" "pioneers"
++.TH pioneers-server-console 6 "February 24, 2013" "pioneers"
+ .SH NAME
+ pioneers-server-console \- command-line game server for Pioneers
+ 
+@@ -53,13 +53,13 @@ Start up \fInum\fP computer players.
+ .BI "\-\-version"
+ Show version information.
+ 
+-.SS Meta-server options
++.SS Metaserver options
+ .TP
+ .BI "\-r,\-\-register"
+-Register with a meta server.  The meta server to use can be overridden
++Register with a metaserver.  The metaserver to use can be overridden
+ with the
+ .B \-m
+-option. Default meta sever: pioneers.debian.net
++option. Default metaserver: pioneers.debian.net
+ .TP
+ .BI "\-m,\-\-meta\-server" " metaserver"
+ Register this server with the metaserver at the specified address. 
+@@ -98,7 +98,7 @@ The default settings of the server can b
+ following three environment variables:
+ .TP 
+ .B PIONEERS_META_SERVER
+-The hostname of the meta-server when no meta-server is specified on the
++The hostname of the metaserver when no metaserver is specified on the
+ command-line.
+ .TP
+ .B PIONEERS_SERVER_NAME
+Index: pioneers-14.1/docs/pioneers-server-gtk.6
+===================================================================
+--- pioneers-14.1.orig/docs/pioneers-server-gtk.6
++++ pioneers-14.1/docs/pioneers-server-gtk.6
+@@ -28,7 +28,7 @@ The default settings of the server can b
+ following three environment variables:
+ .TP 
+ .B PIONEERS_META_SERVER
+-The hostname of the meta-server when no meta-server is specified in the
++The hostname of the metaserver when no metaserver is specified in the
+ user interface. (The settings file takes precedence)
+ .TP
+ .B PIONEERS_SERVER_NAME
+Index: pioneers-14.1/docs/pioneers.6
+===================================================================
+--- pioneers-14.1.orig/docs/pioneers.6
++++ pioneers-14.1/docs/pioneers.6
+@@ -1,4 +1,4 @@
+-.TH pioneers 6 "January 8, 2012" "pioneers"
++.TH pioneers 6 "Februari 24, 2013" "pioneers"
+ .SH NAME
+ pioneers \- network implementation of Settlers of Catan
+ 
+@@ -41,8 +41,8 @@ Use this name for the player instead of
+ .BI "\-v, \-\-spectator"
+ Connect as spectator instead of as a player
+ .TP
+-.BI "\-m, \-\-meta\-server" " meta-server"
+-Connect to this meta-server instead of the meta-server in the settings file
++.BI "\-m, \-\-meta\-server" " metaserver"
++Connect to this metaserver instead of the metaserver in the settings file
+ .TP
+ .BI "\-\-debug"
+ Turn on debugging mode
+@@ -59,8 +59,8 @@ The default settings can be influenced w
+ following environment variable:
+ .TP 
+ .B PIONEERS_META_SERVER
+-The hostname of the meta-server.
+-If it is not set, the default meta-server will be used.
++The hostname of the metaserver.
++If it is not set, the default metaserver will be used.
+ 
+ .SH FILES
+ .B /usr/share/games/pioneers/themes/*
+Index: pioneers-14.1/server/gtk/main.c
+===================================================================
+--- pioneers-14.1.orig/server/gtk/main.c
++++ pioneers-14.1/server/gtk/main.c
+@@ -561,12 +561,12 @@ static GtkWidget *build_server_frame(voi
+ 			 G_CALLBACK(register_toggle_cb), NULL);
+ 	gtk_widget_set_tooltip_text(toggle,
+ 				    _(""
+-				      "Register this game at the meta server"));
++				      "Register this game at the metaserver"));
+ 	register_server =
+ 	    config_get_int_with_default("server/register", TRUE);
+ 
+ 	/* meta server label */
+-	label = gtk_label_new(_("Meta server"));
++	label = gtk_label_new(_("Metaserver"));
+ 	gtk_widget_show(label);
+ 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,
+ 			 GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+Index: pioneers-14.1/server/main.c
+===================================================================
+--- pioneers-14.1.orig/server/main.c
++++ pioneers-14.1/server/main.c
+@@ -104,10 +104,10 @@ static GOptionEntry commandline_game_ent
+ static GOptionEntry commandline_meta_entries[] = {
+ 	{"register", 'r', 0, G_OPTION_ARG_NONE, &register_server,
+ 	 /* Commandline server-console: register */
+-	 N_("Register server with meta-server"), NULL},
++	 N_("Register server with metaserver"), NULL},
+ 	{"meta-server", 'm', 0, G_OPTION_ARG_STRING, &meta_server_name,
+ 	 /* Commandline server-console: meta-server */
+-	 N_("Register at meta-server name (implies -r)"),
++	 N_("Register at metaserver name (implies -r)"),
+ 	 PIONEERS_DEFAULT_META_SERVER},
+ 	{"hostname", 'n', 0, G_OPTION_ARG_STRING, &hostname,
+ 	 /* Commandline server-console: hostname */
+@@ -179,10 +179,10 @@ int main(int argc, char *argv[])
+ 					  PACKAGE);
+ 	context_group = g_option_group_new("meta",
+ 					   /* Commandline server-console: Short description of meta group */
+-					   _("Meta-server Options"),
++					   _("Metaserver Options"),
+ 					   /* Commandline server-console: Long description of meta group */
+ 					   _(""
+-					     "Options for the meta-server"),
++					     "Options for the metaserver"),
+ 					   NULL, NULL);
+ 	g_option_group_set_translation_domain(context_group, PACKAGE);
+ 	g_option_group_add_entries(context_group,
+Index: pioneers-14.1/server/meta.c
+===================================================================
+--- pioneers-14.1.orig/server/meta.c
++++ pioneers-14.1/server/meta.c
+@@ -117,7 +117,7 @@ static void meta_event(NetEvent event, G
+ 				if (num_redirects++ == 10) {
+ 					log_message(MSG_INFO,
+ 						    _(""
+-						      "Too many meta-server redirects\n"));
++						      "Too many metaserver redirects\n"));
+ 					return;
+ 				}
+ 				split_result = g_strsplit(line, " ", 0);
+@@ -166,7 +166,7 @@ static void meta_event(NetEvent event, G
+ 		}
+ 		break;
+ 	case NET_CLOSE:
+-		log_message(MSG_ERROR, _("Meta-server kicked us off\n"));
++		log_message(MSG_ERROR, _("Metaserver kicked us off\n"));
+ 		net_free(&ses);
+ 		break;
+ 	case NET_CONNECT:
+@@ -180,12 +180,12 @@ void meta_register(const gchar * server,
+ 	if (num_redirects > 0)
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Redirected to meta-server at %s, port %s\n"),
++			      "Redirected to metaserver at %s, port %s\n"),
+ 			    server, port);
+ 	else
+ 		log_message(MSG_INFO,
+ 			    _(""
+-			      "Register with meta-server at %s, port %s\n"),
++			      "Register with metaserver at %s, port %s\n"),
+ 			    server, port);
+ 
+ 	if (ses != NULL)
+@@ -202,7 +202,7 @@ void meta_register(const gchar * server,
+ void meta_unregister(void)
+ {
+ 	if (ses != NULL) {
+-		log_message(MSG_INFO, _("Unregister from meta-server\n"));
++		log_message(MSG_INFO, _("Unregister from metaserver\n"));
+ 		net_free(&ses);
+ 	}
+ }
+Index: pioneers-14.1/meta-server/main.c
+===================================================================
+--- pioneers-14.1.orig/meta-server/main.c
++++ pioneers-14.1/meta-server/main.c
+@@ -1066,7 +1066,7 @@ static void convert_to_daemon(void)
+ static GOptionEntry commandline_entries[] = {
+ 	{"daemon", 'd', 0, G_OPTION_ARG_NONE, &make_daemon,
+ 	 /* Commandline meta-server: daemon */
+-	 N_("Daemonize the meta-server on start"), NULL},
++	 N_("Daemonize the metaserver on start"), NULL},
+ 	{"pidfile", 'P', 0, G_OPTION_ARG_STRING, &pidfile,
+ 	 /* Commandline meta-server: pidfile */
+ 	 N_("Pidfile to create when daemonizing (implies -d)"),
+@@ -1074,7 +1074,7 @@ static GOptionEntry commandline_entries[
+ 	 N_("filename")},
+ 	{"redirect", 'r', 0, G_OPTION_ARG_STRING, &redirect_location,
+ 	 /* Commandline meta-server: redirect */
+-	 N_("Redirect clients to another meta-server"), NULL},
++	 N_("Redirect clients to another metaserver"), NULL},
+ 	{"servername", 's', 0, G_OPTION_ARG_STRING, &myhostname,
+ 	 /* Commandline meta-server: server */
+ 	 N_("Use this hostname when creating new games"),
+@@ -1116,7 +1116,7 @@ int main(int argc, char *argv[])
+ 	bind_textdomain_codeset(PACKAGE, "UTF-8");
+ 
+ 	/* Long description in the commandline for server-console: help */
+-	context = g_option_context_new(_("- Meta server for Pioneers"));
++	context = g_option_context_new(_("- Metaserver for Pioneers"));
+ 	g_option_context_add_main_entries(context,
+ 					  commandline_entries, PACKAGE);
+ 	g_option_context_parse(context, &argc, &argv, &error);
+@@ -1132,7 +1132,7 @@ int main(int argc, char *argv[])
+ 		g_print(" ");
+ 		g_print(FULL_VERSION);
+ 		g_print(", ");
+-		g_print(_("meta-server protocol:"));
++		g_print(_("metaserver protocol:"));
+ 		g_print(" ");
+ 		g_print(META_PROTOCOL_VERSION);
+ 		g_print("\n");
+@@ -1186,7 +1186,7 @@ int main(int argc, char *argv[])
+ 	sigemptyset(&myusr1action.sa_mask);
+ 	sigaction(SIGUSR1, &myusr1action, &oldusr1action);
+ 
+-	my_syslog(LOG_INFO, "Pioneers meta server started.");
++	my_syslog(LOG_INFO, "Pioneers metaserver started.");
+ 	select_loop();
+ 
+ 	sigaction(SIGUSR1, &oldusr1action, NULL);
+Index: pioneers-14.1/common/gtk/metaserver.c
+===================================================================
+--- pioneers-14.1.orig/common/gtk/metaserver.c
++++ pioneers-14.1/common/gtk/metaserver.c
+@@ -83,7 +83,7 @@ static void metaserver_init(MetaServer *
+ 	gtk_widget_show(ms->combo_box);
+ 	gtk_widget_set_tooltip_text(ms->combo_box,
+ 				    /* Tooltip for the list of meta servers */
+-				    _("Select a meta server"));
++				    _("Select a metaserver"));
+ 	gtk_table_resize(GTK_TABLE(ms), 1, 1);
+ 	gtk_table_attach_defaults(GTK_TABLE(ms), ms->combo_box,
+ 				  0, 1, 0, 1);
diff -Nru pioneers-14.1/debian/patches/svn2085.diff pioneers-14.1/debian/patches/svn2085.diff
--- pioneers-14.1/debian/patches/svn2085.diff	1970-01-01 01:00:00.000000000 +0100
+++ pioneers-14.1/debian/patches/svn2085.diff	2014-11-28 08:06:57.000000000 +0100
@@ -0,0 +1,109 @@
+Description: Added metadata to the icons, explaining the license
+Author: Roland Clobus <rclobus@rclobus.nl>
+Origin: upstream
+Bug: 765319
+Applied-Upstream: svn revision 2085
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: pioneers-14.1/editor/gtk/pioneers-editor.svg
+===================================================================
+--- pioneers-14.1.orig/editor/gtk/pioneers-editor.svg
++++ pioneers-14.1/editor/gtk/pioneers-editor.svg
+@@ -5,13 +5,28 @@
+ <svg
+    xmlns="http://www.w3.org/2000/svg";
+    xmlns:xlink="http://www.w3.org/1999/xlink";
++   xmlns:dc="http://purl.org/dc/elements/1.1/";
++   xmlns:cc="http://creativecommons.org/ns#";
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    version="1.0"
+    x="0"
+    y="0"
+    width="354.330688"
+    height="354.330688"
+    id="svg620"
+-   xml:space="preserve"><defs
++   xml:space="preserve"><metadata
++   id="metadata36"><rdf:RDF><cc:Work
++       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
++         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><dc:title /><cc:license
++         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:contributor><cc:Agent><dc:title>The pencil is taken from the image 'edit-find-replace.svg' from the GNOME icon theme 'Gorilla' (https://download.gnome.org/teams/art.gnome.org/themes/icon/ICON-Gorilla.tar.bz2) which is created by Jakub Steiner and relicensed to CC-BY-SA 4.0.</dc:title></cc:Agent></dc:contributor><dc:description>Icon for the Pioneers editor.
++The colours are similar to the colours in the Classic theme.</dc:description></cc:Work><cc:License
++       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Attribution"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#ShareAlike"; /></cc:License></rdf:RDF></metadata><defs
+    id="defs622" /><g
+    transform="matrix(1.38939,0,0,1.38939,-162.8163,-618.7101)"
+    style="font-size:12;"
+Index: pioneers-14.1/server/gtk/pioneers-server.svg
+===================================================================
+--- pioneers-14.1.orig/server/gtk/pioneers-server.svg
++++ pioneers-14.1/server/gtk/pioneers-server.svg
+@@ -5,13 +5,28 @@
+ <svg
+    xmlns="http://www.w3.org/2000/svg";
+    xmlns:xlink="http://www.w3.org/1999/xlink";
++   xmlns:dc="http://purl.org/dc/elements/1.1/";
++   xmlns:cc="http://creativecommons.org/ns#";
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    version="1.0"
+    x="0"
+    y="0"
+    width="354.330688"
+    height="354.330688"
+    id="svg620"
+-   xml:space="preserve"><defs
++   xml:space="preserve"><metadata
++   id="metadata4829"><rdf:RDF><cc:Work
++       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
++         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><cc:license
++         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for the Pioneers server.
++The colours are similar to the colours in the Classic theme.</dc:description><dc:contributor><cc:Agent><dc:title>The computer is taken from the image 'computer.svg' from the GNOME icon theme 'Gorilla' (https://download.gnome.org/teams/art.gnome.org/themes/icon/ICON-Gorilla.tar.bz2) which is created by Jakub Steiner and relicensed to CC-BY-SA 4.0.</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
++       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Attribution"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#ShareAlike"; /></cc:License></rdf:RDF></metadata><defs
+    id="defs622" /><g
+    transform="matrix(1.38939,0,0,1.39,-162.8163,-618.7101)"
+    style="font-size:12;"
+Index: pioneers-14.1/client/gtk/data/pioneers.svg
+===================================================================
+--- pioneers-14.1.orig/client/gtk/data/pioneers.svg
++++ pioneers-14.1/client/gtk/data/pioneers.svg
+@@ -5,13 +5,28 @@
+ <svg
+    xmlns="http://www.w3.org/2000/svg";
+    xmlns:xlink="http://www.w3.org/1999/xlink";
++   xmlns:dc="http://purl.org/dc/elements/1.1/";
++   xmlns:cc="http://creativecommons.org/ns#";
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    version="1.0"
+    x="0"
+    y="0"
+    width="354.330688"
+    height="354.330688"
+    id="svg620"
+-   xml:space="preserve"><defs
++   xml:space="preserve"><metadata
++   id="metadata3867"><rdf:RDF><cc:Work
++       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
++         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><cc:license
++         rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; /><dc:title /><dc:creator><cc:Agent><dc:title>Roland Clobus</dc:title></cc:Agent></dc:creator><dc:description>Icon for Pioneers.
++The colours are similar to the colours in the Classic theme.</dc:description></cc:Work><cc:License
++       rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Reproduction"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#Distribution"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Notice"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#Attribution"; /><cc:permits
++         rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; /><cc:requires
++         rdf:resource="http://creativecommons.org/ns#ShareAlike"; /></cc:License></rdf:RDF></metadata><defs
+    id="defs622" /><g
+    transform="matrix(1.38939,0,0,1.38939,-162.8163,-618.7101)"
+    style="font-size:12;"
diff -Nru pioneers-14.1/debian/pioneers-meta-server.init pioneers-14.1/debian/pioneers-meta-server.init
--- pioneers-14.1/debian/pioneers-meta-server.init	2012-05-18 15:30:55.000000000 +0200
+++ pioneers-14.1/debian/pioneers-meta-server.init	2014-11-29 15:03:18.000000000 +0100
@@ -6,8 +6,8 @@
 # Required-Stop:	$syslog $network $remote_fs
 # Default-Start:	2 3 4 5
 # Default-Stop:		0 1 6
-# Short-Description:	Meta-server for Pioneers
-# Description:		Start a meta-server for Pioneers, to allow
+# Short-Description:	Metaserver for Pioneers
+# Description:		Start a metaserver for Pioneers, to allow
 #			clients to find servers.
 ### END INIT INFO
 
@@ -17,10 +17,10 @@
 # Port range
 PORT_RANGE="5560-5569"
 
-# Arguments to meta-server.
+# Arguments to metaserver.
 META_SERVER_ARGS=""
 
-# Reported hostname for servers started by the meta-server.
+# Reported hostname for servers started by the metaserver.
 META_SERVER_NAME="`dnsdomainname --fqdn`"
 
 # Arguments to start-stop-daemon.
@@ -40,7 +40,7 @@
 
 export PIONEERS_META_SERVER
 NAME=pioneers-meta-server
-DESC="meta-server for Pioneers"
+DESC="metaserver for Pioneers"
 DAEMON=/usr/games/pioneers-meta-server
 ARGS="--pidfile $PIDFILE --exec $DAEMON $ARGS"
 START_ARGS="--background --oknodo --start $ARGS -- $PORT_RANGE $META_SERVER_ARGS $META_SERVER_NAME"
diff -Nru pioneers-14.1/debian/pioneers-meta-server.postinst pioneers-14.1/debian/pioneers-meta-server.postinst
--- pioneers-14.1/debian/pioneers-meta-server.postinst	2012-11-01 11:01:45.000000000 +0100
+++ pioneers-14.1/debian/pioneers-meta-server.postinst	2014-11-29 15:03:18.000000000 +0100
@@ -11,9 +11,9 @@
 	. "$CONFIG_FILE"
 else
 	cat > "$CONFIG_FILE" << EOF
-# This file contains the settings for the pioneers meta-server.
+# This file contains the settings for the pioneers metaserver.
 # It is used by /etc/init.d/pioneers-meta-server, for starting and stopping
-#  the meta-server.
+#  the metaserver.
 # See /etc/init.d/pioneers-meta-server for possible variables to assign.
 # If no value is given here, the default from that file is used.
 #
diff -Nru pioneers-14.1/debian/pioneers-meta-server.templates pioneers-14.1/debian/pioneers-meta-server.templates
--- pioneers-14.1/debian/pioneers-meta-server.templates	2010-03-18 10:04:30.000000000 +0100
+++ pioneers-14.1/debian/pioneers-meta-server.templates	2014-12-21 01:27:00.000000000 +0100
@@ -1,10 +1,10 @@
 Template: pioneers-meta-server/ports
 Type: string
 Default: 5560-5569
-_Description: Port range for creating new games on the meta-server:
- The meta-server can create new games, so players don't need to install and
+_Description: Port range for creating new games on the metaserver:
+ The metaserver can create new games, so players don't need to install and
  run the pioneers server. The ports which are used for these games can be
- specified. If this field is left empty, the meta-server will disable its
+ specified. If this field is left empty, the metaserver will disable its
  game creation functionality.
  .
  If the value is not empty, it must be two port numbers, separated by a minus
@@ -14,15 +14,15 @@
 Type: string
 Default:
 _Description: Server name for created games:
- In some cases, the name the meta-server uses for itself when creating new
+ In some cases, the name the metaserver uses for itself when creating new
  games is incorrect. If this field is not left empty, it is used to override
  the detected hostname.
 
 Template: pioneers-meta-server/arguments
 Type: string
 Default:
-_Description: Extra arguments to pass to the meta-server:
- These arguments are passed to the meta-server. There are only two sensible
+_Description: Extra arguments to pass to the metaserver:
+ These arguments are passed to the metaserver. There are only two sensible
  arguments:
   * --syslog-debug: Send debugging output to syslog
-  * --redirect: Redirect clients to another meta-server
+  * --redirect: Redirect clients to another metaserver
diff -Nru pioneers-14.1/debian/po/cs.po pioneers-14.1/debian/po/cs.po
--- pioneers-14.1/debian/po/cs.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/cs.po	2014-12-21 01:29:57.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-25 10:09+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -18,17 +18,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Rozsah portÅ¯ pro vytvÃ¡Å?enÃ novÃ½ch her na metaserveru:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Metaserver mÅ¯Å¾e vytvÃ¡Å?et novÃ© hry, takÅ¾e hrÃ¡Ä?i nemusÃ instalovat a "
 "provozovat vlastnÃ server pro pioneers. MÅ¯Å¾ete zadat rozsah portÅ¯, kterÃ© se "
@@ -53,7 +53,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -64,17 +64,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "DalÅ¡Ã argumentu, kterÃ© se majÃ pÅ?edat metaserveru:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Tyto argumenty se pÅ?edajÃ metaserveru. SmysluplnÃ© argumenty jsou v podstatÄ? "
 "dva:\n"
diff -Nru pioneers-14.1/debian/po/da.po pioneers-14.1/debian/po/da.po
--- pioneers-14.1/debian/po/da.po	2011-08-18 16:24:35.000000000 +0200
+++ pioneers-14.1/debian/po/da.po	2014-12-21 01:30:26.000000000 +0100
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.4-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-11 11:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2011-07-14 12:42+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,22 +19,22 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Portinterval for oprettelse af nye spil pÃ¥ metaserveren:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
-"Metaserveren kan oprette nye spil, sÃ¥ spillere ikke skal installere og "
-"kÃ¸re pioneers' server. Portene, som bruges for disse spil, kan angives. "
-"Hvis dette felt er tomt, vil metaserveren deaktivere dens funktionalitet "
-"for spiloprettelse."
+"Metaserveren kan oprette nye spil, sÃ¥ spillere ikke skal installere og kÃ¸re "
+"pioneers' server. Portene, som bruges for disse spil, kan angives. Hvis "
+"dette felt er tomt, vil metaserveren deaktivere dens funktionalitet for "
+"spiloprettelse."
 
 #. Type: string
 #. Description
@@ -55,31 +56,30 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
-"I nogle tilfÃ¦lde er navnet metaserveren bruger for sig selv, nÃ¥r den opretter "
-"nye spil ikke korrekt. Hvis dette felt ikke efterlades tomt, bruges det til "
-"at overskrive det detekterede vÃ¦rtsnavn."
+"I nogle tilfÃ¦lde er navnet metaserveren bruger for sig selv, nÃ¥r den "
+"opretter nye spil ikke korrekt. Hvis dette felt ikke efterlades tomt, bruges "
+"det til at overskrive det detekterede vÃ¦rtsnavn."
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Ekstra argumenter at videresende til metaserveren:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Disse argumenter videresendes til metaserveren. Der er kun to fornuftige "
 "argumenter:\n"
 " * --syslog-debug: Send fejlsÃ¸gningsuddata til syslog\n"
 " * --redirect: Videresend klienter til en anden metaserver"
-
diff -Nru pioneers-14.1/debian/po/de.po pioneers-14.1/debian/po/de.po
--- pioneers-14.1/debian/po/de.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/de.po	2014-12-21 01:30:59.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-22 22:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -18,17 +18,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Port-Bereich, um neue Spiele auf dem Meta-Server zu erstellen:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Der Meta-Server kann neue Spiele erstellen, daher mÃ¼ssen die Spieler den "
 "Pioneers-Server nicht installieren und ausfÃ¼hren. Die fÃ¼r diese Spiele zu "
@@ -56,7 +56,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -67,17 +67,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "ZusÃ¤tzliche Argumente, die an den Meta-Server Ã¼bergeben werden sollen:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Diese Argumente werden an den Meta-Server Ã¼bergeben. Es gibt nur zwei "
 "sinnvolle Argumente:\n"
diff -Nru pioneers-14.1/debian/po/en_GB.po pioneers-14.1/debian/po/en_GB.po
--- pioneers-14.1/debian/po/en_GB.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/en_GB.po	2014-12-21 01:31:26.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pioneers 0.12.3-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2010-01-24 14:08+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2010-01-03 05:53+0000\n"
 "Last-Translator: Philipp Kleinhenz <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -21,22 +21,22 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
-msgstr "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
+msgstr "Port range for creating new games on the metaserver:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 
 #. Type: string
 #. Description
@@ -58,30 +58,30 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
-msgstr "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
+msgstr "Extra arguments to pass to the metaserver:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
 " * --redirect: Redirect clients to another meta-server"
diff -Nru pioneers-14.1/debian/po/es.po pioneers-14.1/debian/po/es.po
--- pioneers-14.1/debian/po/es.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/es.po	2014-12-21 01:32:00.000000000 +0100
@@ -28,7 +28,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-4\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2009-03-08 12:35+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -40,17 +40,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Rango de puertos para crear juegos nuevos en el meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "El meta-servidor puede crear juegos nuevos, de modo que los jugadores no "
 "necesitan instalar y ejecutar el servidor de pioneers. Los puertos que se "
@@ -77,7 +77,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -88,17 +88,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Los argumentos extras para pasar al meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Estos argumentos se pasan al meta-servidor. SÃ³lo hay dos argumentos "
 "prÃ¡cticos:\n"
diff -Nru pioneers-14.1/debian/po/eu.po pioneers-14.1/debian/po/eu.po
--- pioneers-14.1/debian/po/eu.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/eu.po	2014-12-21 01:50:36.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pioneers-eu\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-13 10:09+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -20,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Meta-zerbitzarian joko berriak sortzeko ataka bitartea:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Meta-zerbitzaria joko berriak sortzeko gai da erabiltzaileek pioneers "
 "zerbitzaria instalatu eta abiarazi behar ez dezaten. Joko hauetarako "
@@ -57,7 +57,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -68,17 +68,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Meta-zerbitzarira bidaltzeko argumentu gehigarriak:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Argumentu hauek meta-zerbitzarira bidaliko dira. Bi argumentu erabilgarri "
 "bakarrik daude:\n"
diff -Nru pioneers-14.1/debian/po/fi.po pioneers-14.1/debian/po/fi.po
--- pioneers-14.1/debian/po/fi.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/fi.po	2014-12-21 01:32:50.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2009-06-30 22:03+0300\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -20,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Porttialue uusien pelien luomiseen meta-palvelimelle:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Meta-palvelin voi luoda uusia pelejÃ¤, jolloin pelaajien ei tarvitse asentaa "
 "ja ajaa pioneers-palvelinta. Voit mÃ¤Ã¤rittÃ¤Ã¤ tÃ¤ssÃ¤ nÃ¤iden pelien kÃ¤yttÃ¤mÃ¤t "
@@ -57,7 +57,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -68,17 +68,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Meta-palvelimelle annettavat lisÃ¤argumentit:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "TÃ¤ssÃ¤ mÃ¤Ã¤ritettÃ¤vÃ¤t argumentit annetaan meta-palvelimelle. NykyÃ¤Ã¤n on "
 "olemassa vain kaksi jÃ¤rkevÃ¤Ã¤ argumenttia:\n"
diff -Nru pioneers-14.1/debian/po/fr.po pioneers-14.1/debian/po/fr.po
--- pioneers-14.1/debian/po/fr.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/fr.po	2014-12-21 01:33:12.000000000 +0100
@@ -7,20 +7,21 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-13 08:04+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Lanugage: fr\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lanugage: fr\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr ""
 "Plage de ports pour la crÃ©ation de nouvelles parties sur le mÃ©taserveurÂ :"
 
@@ -28,10 +29,10 @@
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Le mÃ©taserveur peut crÃ©er de nouvelle parties, ce qui Ã©vite aux joueurs "
 "d'installer et d'exÃ©cuter le serveur de pioneers. Veuillez indiquer les "
@@ -58,7 +59,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -69,17 +70,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "ParamÃ¨tres supplÃ©mentaires Ã  utiliser avec le mÃ©taserveurÂ :"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Veuillez indiquer les paramÃ¨tres supplÃ©mentaires que vous souhaitez utiliser "
 "avec le mÃ©taserveur. Deux paramÃ¨tres uniquement sont importantsÂ :\n"
diff -Nru pioneers-14.1/debian/po/gl.po pioneers-14.1/debian/po/gl.po
--- pioneers-14.1/debian/po/gl.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/gl.po	2014-12-21 01:33:33.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-12 23:52+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -18,17 +18,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Rango de portos para a creaciÃ³n de novos xogos no metaservidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "O metaservidor pode crear novos xogos, de xeito que os xogadores non "
 "precisan de instalar e executar o servidor de pioneers. PÃ³dense especificar "
@@ -55,7 +55,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -66,17 +66,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Argumentos adicionais a pasar ao metaservidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Hanse pasar estes argumentos ao metaservidor. SÃ³ hai dous argumentos "
 "Ãºtiles:\n"
diff -Nru pioneers-14.1/debian/po/it.po pioneers-14.1/debian/po/it.po
--- pioneers-14.1/debian/po/it.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/it.po	2014-12-21 01:33:52.000000000 +0100
@@ -2,29 +2,30 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2009-08-28 21:16+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
-"Lanuage: it\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Lanuage: it\n"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Intervallo di porte per creare nuovi giochi sul meta-server:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Il meta-server puÃ² creare nuovi giochi, quindi i giocatori non necessitano "
 "di installare e attivare un server pioneers. Le porte usate per questi "
@@ -51,7 +52,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -62,17 +63,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Argomenti aggiuntivi da passare al meta-server:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Questi argomenti sono passati al meta-server. Ci sono solo due argomenti "
 "utili:\n"
diff -Nru pioneers-14.1/debian/po/ja.po pioneers-14.1/debian/po/ja.po
--- pioneers-14.1/debian/po/ja.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/ja.po	2014-12-21 01:34:16.000000000 +0100
@@ -1,12 +1,12 @@
 # Japanese translation of pioneers debconf templates.
 # Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
 # This file is distributed under the same license as the pioneers package.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-5\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2009-09-12 02:27+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
@@ -18,17 +18,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "ã?¡ã?¿ã?µã?¼ã??ä¸?ã?§ä½?æ??ã??ã??ã??æ?°ã??ã??ã?²ã?¼ã? ã?®ã??ã?¼ã??ç?ªå?·ã?®ç¯?å?²:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "ã?¡ã?¿ã?µã?¼ã??ã?¯æ?°ã??ã??ã?²ã?¼ã? ã??ä½?æ??ã?§ã??ã??ã?®ã?§ã??ã??ã?¬ã?¤ã?¤ã?¼ã?¯ pioneers ã?µã?¼ã??ã??ã?¤ã?³"
 "ã?¹ã??ã?¼ã?«ã??ã?¦å??ä½?ã??ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??ã??ã??ã?¼ã??ç?ªå?·ã?¯ã??ã??ã??ã?®ã?²ã?¼ã? ã??å?¤å?¥ã??ã??"
@@ -55,7 +55,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -65,17 +65,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "ã?¡ã?¿ã?µã?¼ã??ã?«æ¸¡ã??è¿½å? å¼?æ?°:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "ä»¥ä¸?ã?®å¼?æ?°ã??ã?¡ã?¿ã?µã?¼ã??ã?«æ¸¡ã??ã??ã?¾ã??ã??äº?ã?¤ã? ã??é??è¦?ã?ªå¼?æ?°ã??ã??ã??ã?¾ã??:\n"
 " * --syslog-debug: syslog ã?«ã??ã??ã??ã?°å?ºå??ã??é??ã??\n"
diff -Nru pioneers-14.1/debian/po/nl.po pioneers-14.1/debian/po/nl.po
--- pioneers-14.1/debian/po/nl.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/nl.po	2014-12-21 01:38:29.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: 0.12.4-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-25 09:22+0200\n"
 "Last-Translator: Bas Wijnen <wijnen@debian.org>\n"
 "Language-Team: nl <debian-l10n-dutch@lists.debian.org>\n"
@@ -18,7 +18,7 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr ""
 "Poorten om te gebruiken voor het starten van nieuwe spellen door de meta-"
 "server:"
@@ -27,10 +27,10 @@
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "De meta-server kan nieuwe spellen starten. Spelers hoeven dan de pioneers "
 "server niet te draaien. De poorten die gebruikt worden voor deze spellen "
@@ -57,7 +57,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -68,17 +68,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Extra argumenten voor de meta-server:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Deze argumenten worden meegegeven aan de meta-server. Er zijn twee zinnige "
 "argumenten:\n"
diff -Nru pioneers-14.1/debian/po/pt_BR.po pioneers-14.1/debian/po/pt_BR.po
--- pioneers-14.1/debian/po/pt_BR.po	2012-02-25 18:45:19.000000000 +0100
+++ pioneers-14.1/debian/po/pt_BR.po	2014-12-21 01:38:48.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.5-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2011-11-24 10:51+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2012-02-20 16:23-0200\n"
 "Last-Translator: J.S.JÃºnior <dgjunior4@hotmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -20,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Intervalo de portas para a criaÃ§Ã£o de novos jogos no meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "O meta-servidor pode criar novos jogos, por isso os jogadores nÃ£o precisam "
 "instalar e executar o servidor pioneers. As portas que sÃ£o utilizadas para "
@@ -57,7 +57,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -68,17 +68,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Argumentos extra para passar para o meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Estes argumentos sÃ£o passados para o meta-servidor. HÃ¡ apenas dois "
 "argumentos sensÃveis:\n"
diff -Nru pioneers-14.1/debian/po/pt.po pioneers-14.1/debian/po/pt.po
--- pioneers-14.1/debian/po/pt.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/pt.po	2014-12-21 01:39:09.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-13 11:00+0100\n"
 "Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -18,17 +18,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Intervalo de portos para criar novos jogos no meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "O meta-servidor pode criar novos jogos, para que os jogadores nÃ£o precisem "
 "de instalar e correr o servidor pioneers. Os portos que sÃ£o usados para "
@@ -55,7 +55,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -66,17 +66,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Argumentos extra para passar ao meta-servidor:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Estes argumentos sÃ£o passados ao meta-servidor. Apenas dois argumentos sÃ£o "
 "relevantes:\n"
diff -Nru pioneers-14.1/debian/po/ru.po pioneers-14.1/debian/po/ru.po
--- pioneers-14.1/debian/po/ru.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/ru.po	2014-12-21 01:39:31.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-06-03 21:56+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -15,23 +15,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Ð?Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð¿Ð¾Ñ?Ñ?Ð¾Ð² Ð´Ð»Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¸Ð³Ñ? Ð½Ð° Ð¼ÐµÑ?Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Ð?ÐµÑ?Ð°-Ñ?ÐµÑ?Ð²ÐµÑ? Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð¾Ð·Ð´Ð°Ð²Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ Ð¸Ð³Ñ?Ñ?, Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼Ñ? Ð¸Ð³Ñ?Ð¾ÐºÐ°Ð¼ Ð½ÐµÐ½Ñ?Ð¶Ð½Ð¾ "
 "Ñ?Ñ?Ñ?Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ?Ñ? Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ñ?ÐµÑ?Ð²ÐµÑ? pioneers. Ð?Ð¾Ð¶Ð½Ð¾ Ñ?ÐºÐ°Ð·Ð°Ñ?Ñ? Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð¿Ð¾Ñ?Ñ?Ð¾Ð², "
@@ -58,7 +58,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -69,17 +69,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð´Ð»Ñ? Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð¼ÐµÑ?Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Ð?ÐµÑ?Ð°-Ñ?ÐµÑ?Ð²ÐµÑ? Ð¿Ñ?Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?. Ð?Ð¾Ñ? Ð´Ð²Ð° Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð°:\n"
 " * --syslog-debug: Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ? Ð¾Ñ?Ð»Ð°Ð´Ð¾Ñ?Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð² syslog\n"
diff -Nru pioneers-14.1/debian/po/sv.po pioneers-14.1/debian/po/sv.po
--- pioneers-14.1/debian/po/sv.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/sv.po	2014-12-21 01:39:48.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pioneers\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-11-22 22:36+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -20,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Portnummer fÃ¶r skapande av nya spel pÃ¥ meta-servern."
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "Meta-servern kan skapa nya spel sÃ¥ att spelarna inte behÃ¶ver installera och "
 "kÃ¶ra pioneers-servern. Portarna som anvÃ¤nds till dessa spel kan anges hÃ¤r. "
@@ -56,7 +56,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -67,17 +67,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "Extra argument som ska skickas till meta-servern:"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Dessa argument skickas till meta-servern. det finns bara tvÃ¥ vettiga "
 "argument.\n"
diff -Nru pioneers-14.1/debian/po/templates.pot pioneers-14.1/debian/po/templates.pot
--- pioneers-14.1/debian/po/templates.pot	2010-04-03 00:37:25.000000000 +0200
+++ pioneers-14.1/debian/po/templates.pot	2014-12-21 01:28:52.000000000 +0100
@@ -6,12 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: pioneers\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2010-04-03 00:21+0200\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 
 #. Type: string
@@ -50,7 +51,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -58,15 +59,15 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
diff -Nru pioneers-14.1/debian/po/vi.po pioneers-14.1/debian/po/vi.po
--- pioneers-14.1/debian/po/vi.po	2011-08-18 16:14:33.000000000 +0200
+++ pioneers-14.1/debian/po/vi.po	2014-12-21 01:40:08.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pioneers 0.12.2-1\n"
 "Report-Msgid-Bugs-To: pioneers@packages.debian.org\n"
-"POT-Creation-Date: 2009-11-25 13:11+0100\n"
+"POT-Creation-Date: 2014-12-21 01:28+0100\n"
 "PO-Revision-Date: 2008-05-16 21:18+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,17 +20,17 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
-msgid "Port range for creating new games on the meta-server:"
+msgid "Port range for creating new games on the metaserver:"
 msgstr "Pháº¡m vi cá»?ng Ä?á»? táº¡o lÆ°á»£t chÆ¡i má»?i trÃªn siÃªu trÃ¬nh phá»¥c vá»¥ :"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:1001
 msgid ""
-"The meta-server can create new games, so players don't need to install and "
+"The metaserver can create new games, so players don't need to install and "
 "run the pioneers server. The ports which are used for these games can be "
-"specified. If this field is left empty, the meta-server will disable its "
-"game creation functionality."
+"specified. If this field is left empty, the metaserver will disable its game "
+"creation functionality."
 msgstr ""
 "SiÃªu trÃ¬nh phá»¥c vá»¥ cÃ³ thá»? táº¡o cÃ¡c lÆ°á»£t chÆ¡i má»?i, do Ä?Ã³ ngÆ°á»?i chÆ¡i khÃ´ng cáº§n "
 "cÃ i Ä?áº·t vÃ  cháº¡y trÃ¬nh phá»¥c vá»¥ pioneers. CÅ©ng cÃ³ thá»? ghi rÃµ nhá»¯ng cá»?ng Ä?Æ°á»£c "
@@ -56,7 +56,7 @@
 #. Description
 #: ../pioneers-meta-server.templates:2001
 msgid ""
-"In some cases, the name the meta-server uses for itself when creating new "
+"In some cases, the name the metaserver uses for itself when creating new "
 "games is incorrect. If this field is not left empty, it is used to override "
 "the detected hostname."
 msgstr ""
@@ -67,17 +67,18 @@
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
-msgid "Extra arguments to pass to the meta-server:"
+msgid "Extra arguments to pass to the metaserver:"
 msgstr "CÃ¡c Ä?á»?i sá»? thÃªm cáº§n gá»i cho siÃªu trÃ¬nh phá»¥c vá»¥ :"
 
 #. Type: string
 #. Description
 #: ../pioneers-meta-server.templates:3001
+#, fuzzy
 msgid ""
-"These arguments are passed to the meta-server. There are only two sensible "
+"These arguments are passed to the metaserver. There are only two sensible "
 "arguments:\n"
 " * --syslog-debug: Send debugging output to syslog\n"
-" * --redirect: Redirect clients to another meta-server"
+" * --redirect: Redirect clients to another metaserver"
 msgstr ""
 "Nhá»¯ng Ä?á»?i sá»? nÃ y Ä?Æ°á»£c gá»i cho siÃªu trÃ¬nh phá»¥c vá»¥. Chá»? cÃ³ hai Ä?á»?i sá»? há»¯u "
 "Ãch:\n"

Attachment: signature.asc
Description: OpenPGP digital signature

Reply to:

References:
- Bug#768176: unblock: pioneers/15.3-1
  - From: Niels Thykier <niels@thykier.net>
- Bug#768176: unblock: pioneers/15.3-1
  - From: Roland Clobus <rclobus@rclobus.nl>
- Bug#768176: unblock: pioneers/15.3-1
  - From: Niels Thykier <niels@thykier.net>

Prev by Date: Bug#773163: marked as done (unblock: systemd/215-8)
Next by Date: Bug#770627: marked as done (pre-approval: unblock: dpkg/1.17.22)
Previous by thread: Bug#768176: unblock: pioneers/15.3-1
Next by thread: 0xffff 0.6.1
Index(es):
- Date
- Thread