From f2470a290fde5b4990f44d07933cd2373d8fc256 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 15 Feb 2016 15:30:55 +1100
Subject: [PATCH 01/99] Update eo.po to the latest version from the Translation
 Project

---
 po/eo.po | 236 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 123 insertions(+), 113 deletions(-)

diff --git a/po/eo.po b/po/eo.po
index ba500d3..c07c66d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,22 +1,22 @@
 # *************************************************************************
 # *                                                                       *
 # *                Esperanto Translations for Star Traders                *
-# *                   Copyright (C) 2013, John Zaitseff                   *
-# *          Copyright (C) 2013, Free Software Foundation, Inc.           *
+# *                   Copyright (C) 2013, 2016 John Zaitseff              *
+# *          Copyright (C) 2013, 2016 Free Software Foundation, Inc.      *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Felipe Castro <fefcas@gmail.com>, 2013.
+#   Felipe Castro <fefcas@gmail.com>, 2013, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.4\n"
+"Project-Id-Version: trader 7.9\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2012-05-09 13:57+1000\n"
-"PO-Revision-Date: 2013-02-21 22:20+1100\n"
+"POT-Creation-Date: 2016-01-05 10:52+1100\n"
+"PO-Revision-Date: 2016-02-14 22:32-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -24,6 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: src/trader.c:235
 #, c-format
@@ -191,7 +192,7 @@ msgid "Fornax Express"
 msgstr "Fornakso Ekspresa"
 
 #: src/globals.c:53
-msgid "Gemeni Inc"
+msgid "Gemini Inc"
 msgstr "Ĝemeloj Enk"
 
 #: src/globals.c:54
@@ -312,7 +313,7 @@ msgctxt "input|ContinueGame"
 msgid "Cc"
 msgstr "Dd"
 
-#: src/game.c:341 src/move.c:399
+#: src/game.c:341 src/move.c:413
 #, c-format
 msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
 msgstr "Indiku seanc-numeron [^{1^}-^{9^}] aŭ ^{<CTRL><C>^} por nuligi: "
@@ -389,7 +390,7 @@ msgstr "  Lud-venkanto  "
 
 #. TRANSLATORS: "Player" is used as a column title in a
 #. table containing all player names.
-#: src/game.c:606 src/move.c:868
+#: src/game.c:606 src/move.c:882
 #, c-format
 msgctxt "subtitle"
 msgid "Player"
@@ -545,32 +546,34 @@ msgstr "Interezo:    "
 #. (for <1> and <2>) or 38 characters wide (for <3> and
 #. <CTRL><C>).  The sequences "^{" and "^}" change the
 #. character rendition (attributes) and take up no space.
-#: src/move.c:243 src/exch.c:182
+#: src/move.c:246 src/exch.c:182
 #, c-format
 msgid "^{<1>^} Display stock portfolio"
 msgstr "^{<1>^} Montri la akci-portalon"
 
-#: src/move.c:245
+#: src/move.c:248
 #, c-format
 msgid "^{<2>^} Declare bankruptcy"
 msgstr "^{<2>^} Deklari bankroton"
 
-#: src/move.c:247
+#: src/move.c:250
 #, c-format
 msgid "^{<3>^} Save and end the game"
 msgstr "^{<3>^} Konservi seancon kaj eliri"
 
-#: src/move.c:249
+#: src/move.c:252
 #, c-format
 msgid "^{<CTRL><C>^} Quit the game"
 msgstr "^{<CTRL><C>^} Eliri la ludon"
 
-#. TRANSLATORS: The maximum column width is 38 characters,
-#. including the trailing space.  The sequences "^{", "^}",
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
 #. "^[" and "^]" do not take up any room.  "%lc" takes up
 #. either one or two columns, depending on the appropriate
 #. "output|GameMoves" string in the current PO file.
-#: src/move.c:258
+#: src/move.c:263
 #, c-format
 msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
 msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
@@ -582,59 +585,59 @@ msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
 #. map); each player selects just one move
 #. per turn.  "Move" refers to the player's
 #. choice.
-#: src/move.c:295
+#: src/move.c:309
 #, c-format
 msgid "Move ^{%lc^}"
 msgstr "Movo ^{%lc^}"
 
-#: src/move.c:316
+#: src/move.c:330
 #, c-format
 msgid "^{<2>^} (Declare bankruptcy)"
 msgstr "^{<2>^} (Deklari bankroton)"
 
-#: src/move.c:325
+#: src/move.c:339
 #, c-format
 msgid "^{<3>^} (Save and end the game)"
 msgstr "^{<3>^} (Konservi kaj eliri)"
 
-#: src/move.c:346
+#: src/move.c:360
 #, c-format
 msgid "^{<CTRL><C>^} (Quit the game)"
 msgstr "^{<CTRL><C>^} (Eliri la ludon)"
 
-#: src/move.c:361
+#: src/move.c:375
 #, c-format
 msgid "Are you sure? [^{Y^}/^{N^}] "
 msgstr "Ĉu vi certas? [^{J^}/^{N^}] "
 
-#: src/move.c:378 src/move.c:456
+#: src/move.c:392 src/move.c:470
 #, c-format
 msgid "Saving game %d... "
 msgstr "Konservado de la seanco %d... "
 
-#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
 #, c-format
 msgid "  Bankruptcy Court  "
 msgstr "  Bankrota kortumo  "
 
 #. TRANSLATORS: %ls is the player's name.
-#: src/move.c:688
+#: src/move.c:702
 #, c-format
 msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
 msgstr "%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota."
 
 #. TRANSLATORS: %ls is the player's name.
-#: src/move.c:696
+#: src/move.c:710
 #, c-format
 msgid "%ls has declared bankruptcy."
 msgstr "%ls deklaris bankroton."
 
-#: src/move.c:764
+#: src/move.c:778
 #, c-format
 msgid "  New Company  "
 msgstr "  Nova kompanio  "
 
-#: src/move.c:765
+#: src/move.c:779
 #, c-format
 msgid ""
 "A new company has been formed!\n"
@@ -643,7 +646,7 @@ msgstr ""
 "Nova kompanio naskiĝis!\n"
 "Ĝi nomiĝas ^{%ls^}."
 
-#: src/move.c:824
+#: src/move.c:838
 #, c-format
 msgid ""
 "^{%ls^} has just merged into ^{%ls^}.\n"
@@ -652,7 +655,7 @@ msgstr ""
 "^{%ls^} ĵus kunfandiĝis al ^{%ls^}.\n"
 "Bonvolu rimarki la jenajn transakciojn:\n"
 
-#: src/move.c:830
+#: src/move.c:844
 #, c-format
 msgid "  Company Merger  "
 msgstr "  Kompani-kunfandisto  "
@@ -664,7 +667,7 @@ msgstr "  Kompani-kunfandisto  "
 #. the same length and must contain a trailing space for the
 #. display routines to work correctly.  The maximum length of
 #. each label is 36 characters.
-#: src/move.c:850
+#: src/move.c:864
 #, c-format
 msgctxt "label"
 msgid "Old stock: "
@@ -672,7 +675,7 @@ msgstr "Malnova akcio: "
 
 #. TRANSLATORS: "New stock" refers to the company that has
 #. absorbed the other due to a merger.
-#: src/move.c:861
+#: src/move.c:875
 #, c-format
 msgctxt "label"
 msgid "New Stock: "
@@ -683,7 +686,7 @@ msgstr "Nova akcio:    "
 #. symbol in the current locale.  The maximum column width is
 #. 12 characters INCLUDING the currency symbol (see
 #. MERGE_BONUS_COLS in src/intf.h).
-#: src/move.c:875
+#: src/move.c:889
 #, c-format
 msgctxt "subtitle"
 msgid "Bonus (%ls)"
@@ -692,7 +695,7 @@ msgstr "Premio (%ls)"
 #. TRANSLATORS: "Total" refers to the total number of shares in
 #. the new company after a merger.  The maximum column width is
 #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
-#: src/move.c:880
+#: src/move.c:894
 #, c-format
 msgctxt "subtitle"
 msgid "Total"
@@ -702,7 +705,7 @@ msgstr "Totalo"
 #. player receives in the surviving company after a merger.
 #. The maximum column width is 8 characters (see
 #. MERGE_NEW_STOCK_COLS in src/intf.h).
-#: src/move.c:887
+#: src/move.c:901
 #, c-format
 msgctxt "subtitle"
 msgid "New"
@@ -711,14 +714,14 @@ msgstr "Nova"
 #. TRANSLATORS: "Old" refers to how many shares each player had
 #. in the company ceasing existence.  The maximum column width
 #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
-#: src/move.c:893
+#: src/move.c:907
 #, c-format
 msgctxt "subtitle"
 msgid "Old"
 msgstr "Malnova"
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/move.c:1054
+#: src/move.c:1068
 #, c-format
 msgid ""
 "%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@@ -730,7 +733,7 @@ msgstr ""
 "^{Ĉiuj havaĵoj estis prenataj por repagi gravajn pruntojn.^}"
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/move.c:1078
+#: src/move.c:1092
 #, c-format
 msgid ""
 "%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@@ -749,7 +752,7 @@ msgstr ""
 #. least one trailing space for the display
 #. routines to work correctly.  The maximum
 #. length is 28 characters.
-#: src/move.c:1106
+#: src/move.c:1120
 #, c-format
 msgctxt "label"
 msgid "Amount paid per share: "
@@ -759,18 +762,18 @@ msgstr "Kvanto pagita por akcio: "
 #. share price of a company before it was forced
 #. into bankruptcy by the Bank.  This label must be
 #. the same width as "Amount paid per share".
-#: src/move.c:1114
+#: src/move.c:1128
 #, c-format
 msgctxt "label"
 msgid "Old share value:       "
 msgstr "Malnova akci-valoro:     "
 
-#: src/move.c:1197 src/move.c:1232 src/exch.c:321
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
 #, c-format
 msgid "  Interstellar Trading Bank  "
 msgstr "  Interstelara Komerca Banko  "
 
-#: src/move.c:1199
+#: src/move.c:1213
 #, c-format
 msgid ""
 "You were forced to borrow %N\n"
@@ -779,7 +782,7 @@ msgstr ""
 "Vi estis devigata pruntepreni %N\n"
 "por kovri perdojn el kompani-akcioj."
 
-#: src/move.c:1234
+#: src/move.c:1248
 #, c-format
 msgid ""
 "Your debt has amounted to %N!\n"
@@ -967,8 +970,8 @@ msgctxt "label|Stock A"
 msgid "Return:          "
 msgstr "Rendimento:      "
 
-#. TRANSLATORS: "Current holdings" is the number of shares the
-#. current player owns in this particular company.
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
 #.
 #. Note that the labels "Current holdings", "Percentage owned"
 #. and "Current cash" MUST all be the same length and contain at
@@ -983,13 +986,13 @@ msgstr "Nunaj havaĵoj:    "
 
 #. TRANSLATORS: "Percentage owned" is the current player's
 #. percentage ownership in this particular company.
-#: src/exch.c:633
+#: src/exch.c:636
 #, c-format
 msgctxt "label|Stock B"
 msgid "Percentage owned: "
 msgstr "Elcento posedita: "
 
-#: src/exch.c:638
+#: src/exch.c:641
 #, c-format
 msgctxt "label|Stock B"
 msgid "Current cash:     "
@@ -997,47 +1000,47 @@ msgstr "Nuna mono:        "
 
 #. TRANSLATORS: Each label may be up to 35 characters wide
 #. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
-#: src/exch.c:651
+#: src/exch.c:654
 #, c-format
 msgid "^{<1>^} Buy stock from company"
 msgstr "^{<1>^} Aĉeti akcion el kompanio"
 
-#: src/exch.c:653
+#: src/exch.c:656
 #, c-format
 msgid "^{<2>^} Sell stock back to company"
 msgstr "^{<2>^} Vendi akcion reen al kompanio"
 
-#: src/exch.c:655
+#: src/exch.c:658
 #, c-format
 msgid "^{<3>^} Bid company to issue more shares"
 msgstr "^{<3>^} Peti kompanion vendi pli akciojn"
 
-#: src/exch.c:657
+#: src/exch.c:660
 #, c-format
 msgid "^{<4>^} Exit to the Stock Exchange"
 msgstr "^{<4>^} Eliri la akci-interŝanĝejon"
 
-#: src/exch.c:660
+#: src/exch.c:663
 #, c-format
 msgid "Enter selection [^{1^}-^{4^}]: "
 msgstr "Indiku elekton [^{1^}-^{4^}]: "
 
-#: src/exch.c:716
+#: src/exch.c:719
 #, c-format
 msgid "  No Shares Available  "
 msgstr "  Neniu akcio disponeblas  "
 
-#: src/exch.c:717
+#: src/exch.c:720
 #, c-format
 msgid "No more shares are available for purchase."
 msgstr "Neniu plia akcio disponeblas por aĉeto."
 
-#: src/exch.c:721
+#: src/exch.c:724
 #, c-format
 msgid "  Insufficient Cash  "
 msgstr "  Nesufiĉe da mono  "
 
-#: src/exch.c:722
+#: src/exch.c:725
 #, c-format
 msgid ""
 "You do not have enough cash\n"
@@ -1046,47 +1049,47 @@ msgstr ""
 "Vi ne havas sufiĉe da mono\n"
 "por aĉeti aldonajn akciojn."
 
-#: src/exch.c:733
+#: src/exch.c:736
 #, c-format
 msgid "You can purchase ^{one^} share."
 msgid_plural "You can purchase up to ^{%'ld^} shares."
 msgstr[0] "Vi povas aĉeti ^{unu^} akcion."
 msgstr[1] "Vi povas aĉeti ĝis ^{%'ld^} akciojn."
 
-#: src/exch.c:739
+#: src/exch.c:742
 #, c-format
 msgid "How many shares do you wish to purchase? "
 msgstr "Kiom da akcioj vi deziras aĉeti? "
 
-#: src/exch.c:760
+#: src/exch.c:763
 #, c-format
 msgid "  No Shares  "
 msgstr "  Neniu akcio  "
 
-#: src/exch.c:761
+#: src/exch.c:764
 #, c-format
 msgid "You do not have any shares to sell."
 msgstr "Vi havas neniun akcio por vendi."
 
-#: src/exch.c:768
+#: src/exch.c:771
 #, c-format
 msgid "You can sell ^{one^} share."
 msgid_plural "You can sell up to ^{%'ld^} shares."
 msgstr[0] "Vi povas vendi ^{unu^} akcion."
 msgstr[1] "Vi povas vendi ĝis ^{%'ld^} akciojn."
 
-#: src/exch.c:774
+#: src/exch.c:777
 #, c-format
 msgid "How many shares do you wish to sell? "
 msgstr "Kiom da akcioj vi deziras vendi? "
 
-#: src/exch.c:802
+#: src/exch.c:805
 #, c-format
 msgid "  No Shares Issued  "
 msgstr "  Neniu akcio vendita  "
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/exch.c:804
+#: src/exch.c:807
 #, c-format
 msgid ""
 "%ls has refused\n"
@@ -1095,13 +1098,13 @@ msgstr ""
 "%ls rifuzis\n"
 "disponigi pli da akcioj."
 
-#: src/exch.c:809
+#: src/exch.c:812
 #, c-format
 msgid "  Shares Issued  "
 msgstr "  Akcioj venditaj  "
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/exch.c:811
+#: src/exch.c:814
 #, c-format
 msgid ""
 "%ls has issued\n"
@@ -1116,52 +1119,58 @@ msgstr[1] ""
 "%ls disponigis\n"
 "^{%'ld^} pliajn akciojn."
 
-#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
 #, c-format
 msgid "%s: missing field on line %d"
 msgstr "%s: mankas kampon en linio %d"
 
-#: src/fileio.c:60
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: malpermesata kampo en linio %d"
+
+#: src/fileio.c:51
 #, c-format
 msgid "%s: illegal field on line %d: `%s'"
 msgstr "%s: malpermesata kampo en linio %d: '%s'"
 
-#: src/fileio.c:64
+#: src/fileio.c:55
 #, c-format
 msgid "%s: illegal value on line %d: `%s'"
 msgstr "%s: malpermesata valoro en linio %d: '%s'"
 
-#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
 #, c-format
 msgid "%s: illegal value on line %d"
 msgstr "%s: malpermesata valoro en linio %d"
 
-#: src/fileio.c:103
+#: src/fileio.c:98
 #, c-format
 msgid "%s: illegal characters on line %d"
 msgstr "%s: malpermesataj signoj en linio %d"
 
-#: src/fileio.c:184
+#: src/fileio.c:183
 #, c-format
 msgid "%s: could not convert string"
 msgstr "%s: ne eblis konverti ĉenon"
 
-#: src/fileio.c:255
+#: src/fileio.c:257
 #, c-format
 msgid "  Game Not Found  "
 msgstr "  Seanco ne trovita  "
 
-#: src/fileio.c:256
+#: src/fileio.c:258
 #, c-format
 msgid "Game %d has not been saved to disk."
 msgstr "La seanco %d ne estas konservita en la disko."
 
-#: src/fileio.c:263
+#: src/fileio.c:265
 #, c-format
 msgid "  Game Not Loaded  "
 msgstr "  Seanco ne ŝargita  "
 
-#: src/fileio.c:264
+#: src/fileio.c:266
 #, c-format
 msgid ""
 "Game %d could not be loaded from disk.\n"
@@ -1172,47 +1181,42 @@ msgstr ""
 "\n"
 "^{Dosiero %s: %s^}"
 
-#: src/fileio.c:316
+#: src/fileio.c:319
 #, c-format
 msgid "%s: missing header in game file"
 msgstr "%s: mankas kaplinio en seanc-dosiero"
 
-#: src/fileio.c:319
+#: src/fileio.c:322
 #, c-format
 msgid "%s: not a valid game file"
 msgstr "%s: ne estas valida seanc-dosiero"
 
-#: src/fileio.c:322 src/fileio.c:329
+#: src/fileio.c:325 src/fileio.c:332
 #, c-format
 msgid "%s: missing subheader in game file"
 msgstr "%s: mankas subkaplinio en seanc-dosiero"
 
-#: src/fileio.c:325
+#: src/fileio.c:328
 #, c-format
 msgid "%s: saved under a different version of Star Traders"
 msgstr "%s: konservita sub malsama versio de Star Traders"
 
-#: src/fileio.c:332
+#: src/fileio.c:335
 #, c-format
 msgid "%s: saved under an incompatible character encoding"
 msgstr "%s: konservita sub nekongrua signa enkodigo"
 
-#: src/fileio.c:340
+#: src/fileio.c:343
 #, c-format
 msgid "%s: illegal or missing field on line %d"
 msgstr "%s: malpermesata aŭ mankanta kampo en linio %d"
 
-#: src/fileio.c:384
-#, c-format
-msgid "%s: illegal field on line %d"
-msgstr "%s: malpermesata kampo en linio %d"
-
-#: src/fileio.c:466 src/fileio.c:487
+#: src/fileio.c:479 src/fileio.c:501
 #, c-format
 msgid "  Game Not Saved  "
 msgstr "  Seanco ne konservita  "
 
-#: src/fileio.c:467
+#: src/fileio.c:480
 #, c-format
 msgid ""
 "Game %d could not be saved to disk.\n"
@@ -1223,7 +1227,7 @@ msgstr ""
 "\n"
 "^{Dosierujo %s: %s^}"
 
-#: src/fileio.c:488
+#: src/fileio.c:502
 #, c-format
 msgid ""
 "Game %d could not be saved to disk.\n"
@@ -1552,13 +1556,14 @@ msgstr "Paĝo %d el %d"
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Premu <SPACOn> por daŭrigi ] "
 
-#. TRANSLATORS: The specific use of <SPACE> and
-#. <BACKSPACE> is not essential: you can use <DEL>,
-#. <PAGE-UP>, <UP>, <LEFT> or <BACK-TAB> instead of
-#. <BACKSPACE>, and almost any other key instead of
-#. <SPACE> (other than <ESC>, <CANCEL>, <EXIT>, <CTRL><C>,
-#. <CTRL><G> or <CTRL><\>).
-#: src/help.c:494
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Premu <SPACOn> por daŭrigi aŭ <RETROPAŜOn> por la antaŭa paĝo ] "
@@ -1635,86 +1640,91 @@ msgctxt "answer"
 msgid "No"
 msgstr "Ne"
 
-#: src/utils.c:199 src/utils.c:220
+#: src/utils.c:378 src/utils.c:399
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/utils.c:225
+#: src/utils.c:404
 msgid ": "
 msgstr ": "
 
-#: src/utils.c:238
+#: src/utils.c:417
 #, c-format
 msgid "out of memory"
 msgstr "memoro plenpleniĝas"
 
-#: src/utils.c:571
+#: src/utils.c:1041
 #, c-format
 msgid "xmbstowcs: `%s'"
 msgstr "xmbstowcs: '%s'"
 
-#: src/utils.c:611
+#: src/utils.c:1081
 #, c-format
 msgid "xwcrtomb: NUL"
 msgstr "xwcrtomb: NUL"
 
-#: src/utils.c:616
+#: src/utils.c:1086
 #, c-format
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: '%lc'"
 
-#: lib/getopt.c:547 lib/getopt.c:576
+#: lib/getopt.c:575 lib/getopt.c:604
 #, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:"
 
-#: lib/getopt.c:624 lib/getopt.c:628
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: la modifilo '%s' estas plursenca\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: la modifilo '--%s' ne permesas argumenton\n"
 
-#: lib/getopt.c:637 lib/getopt.c:642
+#: lib/getopt.c:667 lib/getopt.c:672
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n"
 
-#: lib/getopt.c:685 lib/getopt.c:704
+#: lib/getopt.c:715 lib/getopt.c:734
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: la modifilo '--%s' postulas argumenton\n"
 
-#: lib/getopt.c:742 lib/getopt.c:745
+#: lib/getopt.c:772 lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nerekonata modifilo '--%s'\n"
 
-#: lib/getopt.c:753 lib/getopt.c:756
+#: lib/getopt.c:783 lib/getopt.c:786
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nerekonata modifilo '%c%s'\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: lib/getopt.c:835 lib/getopt.c:838
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: malvalida modifilo -- '%c'\n"
 
-#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la modifilo postulas argumenton -- '%c'\n"
 
-#: lib/getopt.c:934 lib/getopt.c:950
+#: lib/getopt.c:964 lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: la modifilo '-W %s' estas plursenca\n"
 
-#: lib/getopt.c:974 lib/getopt.c:992
+#: lib/getopt.c:1004 lib/getopt.c:1022
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n"
 
-#: lib/getopt.c:1013 lib/getopt.c:1031
+#: lib/getopt.c:1043 lib/getopt.c:1061
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: la modifilo '-W %s' postulas argumenton\n"

From eda14932c3b542e2138bb604b96fdfbdc1d9b0ad Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 09:15:58 +1100
Subject: [PATCH 02/99] =?UTF-8?q?Add=20the=20Serbian=20translation=20of=20?=
 =?UTF-8?q?Star=20Traders=20by=20=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B2=20=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Downloaded from the Translation Project at
http://translationproject.org/PO-files/sr/trader-7.9.sr.po
---
 po/sr.po | 1723 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1723 insertions(+)
 create mode 100644 po/sr.po

diff --git a/po/sr.po b/po/sr.po
new file mode 100644
index 0000000..bf05e2b
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,1723 @@
+# Serbian translation for trader.
+# Copyright © 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the trader package.
+#
+# Translators: 
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: trader-7.9\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2016-01-05 10:52+1100\n"
+"PO-Revision-Date: 2016-03-09 12:10+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <(nothing)>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: неисправна вредност за „--max-turn“: „%s“\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: неисправан операнд „%s“\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: неисправан број игре „%s“\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: додатни операнд „%s“\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Звездани трговци (%s) %s\n"
+"Ауторска права © %s, Џон Цајтсеф.\n"
+"\n"
+"Звездани трговци је једноставна игра међузвезданог трговања, у којој треба\n"
+"да оснивате предузећа, купујете и продајете акције, позајмљујете и враћате\n"
+"новац, да бисте постали најбогатији играч (победник).\n"
+"\n"
+"Овај програм је слободан софтвер који се расподељује под условима Гнуове\n"
+"опште јавне лиценце, 3. издања или новијег. Можете слободно да га мењате\n"
+"и/или расподељујете под одређеним условима. Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
+"у мери у којој то допушта закон; погледајте лиценцу за више детаља.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Пробајте „%s --help“ за више података.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Употреба: %s [ОПЦИЈА...] [ИГРА]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Играјте Звездане трговце, једноставну игру међузвезданог трговања.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Могућности:\n"
+"  -V, --version        исписује податке о издању и излази\n"
+"  -h, --help           приказује ову помоћ и излази\n"
+"      --no-color       не користи боје за приказ текста\n"
+"      --max-turn=БРОЈ  поставља број враћања на БРОЈ\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља\n"
+"са том игром.  Ако ИГРА није наведена, почиње нову игру.\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr "Грешке пријавите програмеру %s <%s>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr "Грешке пријавите на <%s>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Грешке „%s“ пријавите на <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Матична страница: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Алтар Звездаш"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Бетелгејз Свемир"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Велики Медвед"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Голењски Отпремник"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Денебола Достава"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Ђило Експрес"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Еридано Шпедиција"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Ждрал и Другари"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "АБВГДЂЕЖ"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*АБВГДЂЕЖ"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "абвгдђежзијклљмнњопр"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Учитавам игру %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Први играч  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Први играч на потезу је ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Ц>^} да наставите игру: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Нн"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Упишите број игара [^{1^}-^{9^}] или ^{<КТРЛ><Ц>^} да откажете: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Упишите ваше име: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Да ли су вам потребна упутства? [^{Y^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Упишите имена играча  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "%d. играч: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Да ли су неком играчу потребна упутства? [^{Y^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Крај игре  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Игра је завршена након %d круга."
+msgstr[1] "Игра је завршена након %d круга."
+msgstr[2] "Игра је завршена након %d кругова."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Укупан износ  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Ваш укупан износ је ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Победник је ^{%ls^}\n"
+"који је под ^[*** СТЕЧАЈЕМ ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Победник је ^{%ls^}\n"
+"са износом од ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Победник игре  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Играч"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Укупан износ (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Играч: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Круг: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Последњи круг ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Портфељ удела  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *  С Т Е Ч А Ј   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Нема предузећа на карти"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Предузеће"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Власништво\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Поседује\n"
+"(акција)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Зарада\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Цена по\n"
+"акцији (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Укупан износ:    "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Текућа готовина: "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Текући дуг:      "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Каматна стопа: "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Прикажите портфељ удела"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Објавите стечај"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Сачувајте и завршите игру"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<КТРЛ><Ц>^} Изађите из игре"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Изаберите потез [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<КТРЛ><Ц>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "На потезу ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Објавите стечај)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Сачувајте и завршите игру)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<КТРЛ><Ц>^} (Изађите из игре)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Да ли сте сигурни? [^{Y^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Чувам игру %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Стечајни суд  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "Међузвездана Трговачка Банка је објавила стечај играчу %ls."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls је објавио стечај."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Ново предузеће  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Направљено је ново предузеће!\n"
+"Њено име је ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} је управо спојено са ^{%ls^}.\n"
+"Имајте на уму следећу трансакцију:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Спајач предузећа  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Стари удео: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Нови удео:  "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Бонус (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Укупно"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Нове"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Старе"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"Међузвездана Трговачка Банка је објавила стечај играчу %ls.\n"
+"\n"
+"^{Сва добра су одузета зарад отплаћивања основних зајмова.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"Међузвездана Трговачка Банка је објавила стечај играчу %ls.\n"
+"\n"
+"^{Банка је пристала да исплати акционарима ^}%.2f%%^{ од вредности акције по свакој поседованој акцији.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Плаћени износ по акцији: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Стара вредност акције:       "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Међузвездана Трговачка Банка  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Приморани сте да позајмите %N да\n"
+"покријете губитке акција предузећа."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Ваш дуг је нарастао на %N!\n"
+"^{Банка је запленила ^}%N^{ од ваше готовине.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Међузвездана берза  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Преосталих\n"
+"акција"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Издатих\n"
+"акција"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Прикажите карту галаксије"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Посетите Трговачку Банку"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Изађите из Берзе"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Унесите избор [^[Слово предузећа^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Ограничење кредита:"
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Позајмите новац  "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Платите дуг      "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Изађите из Банке "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Унесите избор [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Недовољно ограничење кредита  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Банка вам више неће дати новац на зајам."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Колико желите да позајмите? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Без дуга  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Немате дугове за отплаћивање."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Без готовине  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Немате готовине за отплаћивање дуга!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Колико желите да отплатите? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Пренос удела у %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Издатих акција:    "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Преосталих акција: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Цена по акцији:    "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Зарада:            "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Тренутно држи:       "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Проценат власништва: "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Текућа готовина:     "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Купите удео у предузећи"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Препродајте удео предузећу"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Тражите од предузећа да изда акције"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Изађите са Берзе"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Унесите избор [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Нема доступних акција  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Нема више доступних акција за куповину."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Недовољно готовине  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Немате довољно готовине да\n"
+"купите додатне акције."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Можете да купите ^{%'ld^} акцију."
+msgstr[1] "Можете да купите ^{%'ld^} акције."
+msgstr[2] "Можете да купите ^{%'ld^} акција."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Колико акција желите да купите?"
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Без акција  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Немате ниједну акцију за продају."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Можете да продате ^{%'ld^} акцију."
+msgstr[1] "Можете да продате до ^{%'ld^} акције."
+msgstr[2] "Можете да продате до ^{%'ld^} акција."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Колико акција желите да продате?"
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Нема издатих акција  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls је одбио да\n"
+"изда још акција."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Издате акције  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls је издало\n"
+"још ^{%'ld^} акцију."
+msgstr[1] ""
+"%ls је издало\n"
+"још ^{%'ld^} акције."
+msgstr[2] ""
+"%ls је издало\n"
+"још ^{%'ld^} акција."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: недостаје поље у %d. реду"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: недозвољено поље у %d. реду"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: недозвољено поље у %d. реду: „%s“"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: недозвољена вредност у %d. реду: „%s“"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: недозвољена вредност у %d. реду"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: недозвољени знакови у %d. реду"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: не могу да претворим ниску"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Нисам нашао игру  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "%d. игра није сачувана на диск."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Игра није учитана  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"%d. игра се не може учитати са диска.\n"
+"\n"
+"^{Датотека „%s“: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: недостаје заглавље у датотеци игре"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: није исправна датотека игре"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: недостаје подзаглавље у датотеци игре"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: сачувана под другим издањем Звезданих трговаца"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: сачувана под несагласним кодирањем знакова"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: недозвољено или недостаје поље у %d.реду"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Игра није сачувана  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"%d. игра се не може сачувати на диск.\n"
+"\n"
+"^{Директоријум „%s“: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"%d. игра се не може сачувати на диск.\n"
+"\n"
+"^{Датотека „%s“: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BЗвездани трговци^N  је једноставна игра међузвезданог трговања.  Циљ игре\n"
+"је да сакупите што је могуће веће богатство. То ћете постићи оснивањем\n"
+"међузвезданих трговачких путева, њиховим проширивањем и куповањем акција у\n"
+"предузећима која њима управљају. Акцијама расте вредност како предузеће\n"
+"буде повећавало пословање. Поред тога, зарада на свакој акцији (у процентима)\n"
+"се такође мења. Играчи такође могу позајмити новац од Међузвездане Трговачке Банке\n"
+"да би финансирали додатне куповине на берзи.\n"
+"\n"
+"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени\n"
+"приказ одељка галаксије може бити:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N представља ^Bпразан простор^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N представља ^Bзвезду^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Рачунар бира ^B~m^N потеза  (означених од ^k~1^N до ^k~M^N) насумично, и поставља\n"
+"их на карти.  Да изаберете било који од истакнутих положаја, притисните то слово.\n"
+"На пример, неки од потеза на карти може бити:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Приказани потези од ^k~1^N до ^k~5^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N)\n"
+"ће подесити ^Bиспоставу^N, која не припада ни једном предузећу. Стога, ако је потез ^k~3^N\n"
+"изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Ако је, у другом случају, положај поред звезде  (или друге испоставе)\n"
+"изабран, ^Bпредузеће^N ће се основати а његово слово ће се појавити на\n"
+"карти. Као награда за оснивање предузећа, зарађујете првих пет акција.\n"
+"На овај начин се могу основати ^B~c^N предузећа.\n"
+"\n"
+"Ако је положај поред постојећег предузећа изабран, предузеће неће повећати\n"
+"своје деловање за један квадрат. Ово повећава трошкове његових акција а са\n"
+"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод,\n"
+"бирање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~6^N или ^k~8^N повећава предузеће ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Бирање положаја поред звезда повећава вредност ваших залиха око пет пута\n"
+"у односу на проширење које није поред звезде.  Стога потез ^k~6^N треба\n"
+"да има предност над потезом ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~6^N је пожељнији од ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Можете такође да проширите било које предузеће бирајући положај поред испостава.\n"
+"Такве испоставе биће прогутане тим предузећем. Стога ће, потез ^k~1^N проширити\n"
+"предузеће ^B~C^N за ^Bдва^N квадрата. Као бонус, испоставе поред звезда су\n"
+"вредније:  цена акције предузећа ће се повећати већим износом него што би то\n"
+"било за испоставе које нису поред звезда.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Ако су два предузећа одвојена на карти само једним квадратом, тада могу бити\n"
+"^Bспојена^N у једно предузеће бирањем тог положаја (ако је доступан). На пример,\n"
+"на карти испод, предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.\n"
+"Када до тога дође, предузеће  са већом вредношћу добара  преузима ово друго.\n"
+"Овде, предузеће ^B~B^N може да преузме предузеће ^B~A^N. Предузеће ^B~A^N престаје\n"
+"да постоји, иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Када се предузећа споје, играчима се одобравају акције у доминантном предузећу\n"
+"пропорционално поседованом износу у старом предузећу. Такође, готовински бонус\n"
+"се такође плаћа, пропорционално проценту поседништва старог предузећа.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Након што изаберете ваш потез, упишите ^BМеђузвездана берза^N.  Овде можете\n"
+"да купите акције,  да их продате, да позајмите новац од Трговачке Банке или\n"
+"да отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће\n"
+"издаје ограничени број акција — не можете куповати заувек!  Можете, међутим,\n"
+"да затражите издавање још акција. Веће су вам шансе за успех ако поседујете\n"
+"већи део предузећа.\n"
+"\n"
+"Игра се обично завршава након ^B~t^N круга. Међутим, можете да завршите игру\n"
+"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете\n"
+"потез. Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
+"време. Ако је ваш дуг поприлично велик, Банка може то да уради уместо вас!\n"
+"Ако не довршите игру за време које вам је на располагању, можете да сачувате\n"
+"игру и касније да је наставите.\n"
+"\n"
+"\n"
+"^BПобедник игре^N је играч са највећом нето вредношћу (укупан износ готовине,\n"
+"залиха и дуговања).  ^HСрећно^N и нека победи најбољи!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Текст помоћи, 7. страница\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Текст помоћи, 8. страница\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Текст помоћи, 9. страница\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Текст помоћи, 10. страница\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Како да играте  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d. страница од %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Притисните <РАЗМАК> да наставите ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Притисните <РАЗМАК> да наставите или <ПОВРАТНИЦУ> за претходну страницу ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: ниска је у погрешном запису: „%s“"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: знак је недозвољене ширине: „%lc“"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "величина терминала је премала (потребна је %d x %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Звездани трговци"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: НИШТА"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: „%s“"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: недозвољени знак у нисци: „%ls“"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Yy"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Да"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Не"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "нема више меморије"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: „%s“"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: НИШТА"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: „%lc“"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: опција „%s“ је нејасна; могућности:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: опција „%s“ је нејасна\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: опција „--%s“ захтева аргумент\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: непозната опција „--%s“\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: непозната опција „%c%s“\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: неисправна опција -- „%c“\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: опција захтева аргумент -- „%c“\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: опција „-W %s“ је нејасна\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опција „-W %s“ захтева аргумент\n"

From 237fed45c0f2268426bcf34cc0a3c956e230fc8b Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 09:27:51 +1100
Subject: [PATCH 03/99] Start preparing for the next version: bump to v7.10

---
 INSTALL      | 8 ++++----
 NEWS         | 6 ++++++
 configure.ac | 2 +-
 po/da.po     | 4 ++--
 po/de.po     | 4 ++--
 po/en_AU.po  | 4 ++--
 po/en_CA.po  | 4 ++--
 po/en_GB.po  | 4 ++--
 po/en_US.po  | 4 ++--
 po/eo.po     | 4 ++--
 po/fi.po     | 4 ++--
 po/fr.po     | 4 ++--
 po/hr.po     | 4 ++--
 po/hu.po     | 4 ++--
 po/nb.po     | 4 ++--
 po/ru.po     | 4 ++--
 po/sv.po     | 4 ++--
 17 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/INSTALL b/INSTALL
index d552c72..398bc5c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -102,12 +102,12 @@ You can also run configure  in a separate build-only directory tree.  This
 feature requires GNU Make and allows you to keep the source code tree from
 being modified by  the compilation process.  To use  this option, create a
 separate build directory, then run  configure.  For example, if you placed
-the Star Traders  source code tree in $HOME/src/trader-7.9,  you could run
+the Star Traders source code tree in $HOME/src/trader-7.10,  you could run
 something like:
 
-    mkdir $HOME/build/trader-build-7.9
-    cd $HOME/build/trader-build-7.9
-    $HOME/src/trader-7.9/configure
+    mkdir $HOME/build/trader-build-7.10
+    cd $HOME/build/trader-build-7.10
+    $HOME/src/trader-7.10/configure
 
 Once again, the Autoconf manual describes these options (and many others):
 
diff --git a/NEWS b/NEWS
index 28b9771..6e93fbb 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,12 @@ consult the Subversion repository for "trader" on The ZAP Group web server
 at http://www.zap.org.au/services/svn/.
 
 
+Version 7.10 (not yet released)
+-------------------------------
+
+(No changes yet.)
+
+
 Version 7.9 (5th January, 2016)
 -------------------------------
 
diff --git a/configure.ac b/configure.ac
index 5ae91b0..96ff138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-AC_INIT([Star Traders], [7.9], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/])
+AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/])
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
 AC_PREREQ([2.69])
diff --git a/po/da.po b/po/da.po
index 5f31f29..6e64f73 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:15+1100\n"
+"PO-Revision-Date: 2016-03-11 09:24+1100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff --git a/po/de.po b/po/de.po
index e8c2786..bd4a124 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:15+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index bec8e98..5b211f3 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:16+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index ba6bf69..567251f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:16+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 58a36bd..90b7cf7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:16+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index 2242a4a..ba83a27 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:16+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
diff --git a/po/eo.po b/po/eo.po
index b973d61..5977104 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-02-15 17:00+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
diff --git a/po/fi.po b/po/fi.po
index c3723c7..4a2dedb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:16+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
diff --git a/po/fr.po b/po/fr.po
index 315a720..80c0489 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:17+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
diff --git a/po/hr.po b/po/hr.po
index 087aaed..ef507d2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:17+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
diff --git a/po/hu.po b/po/hu.po
index ee1fbe6..8d3ec08 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:17+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
diff --git a/po/nb.po b/po/nb.po
index 1137389..a7840d6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:17+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
diff --git a/po/ru.po b/po/ru.po
index b564616..9db666a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,10 +15,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:17+1100\n"
+"PO-Revision-Date: 2016-03-11 09:25+1100\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
diff --git a/po/sv.po b/po/sv.po
index 0120347..f1ea041 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-01-05 09:18+1100\n"
+"PO-Revision-Date: 2016-03-11 09:26+1100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"

From 9abe562e9357614fe4938da1d64decb51c9a0ea0 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 09:29:56 +1100
Subject: [PATCH 04/99] =?UTF-8?q?Add=20the=20Serbian=20translation=20by=20?=
 =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B=20to=20the=20master=20branch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NEWS       | 2 +-
 po/LINGUAS | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6e93fbb..10e2e00 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ at http://www.zap.org.au/services/svn/.
 Version 7.10 (not yet released)
 -------------------------------
 
-(No changes yet.)
+Added the Serbian translation, with thanks to Мирослав Николић.
 
 
 Version 7.9 (5th January, 2016)
diff --git a/po/LINGUAS b/po/LINGUAS
index 8292ff3..ed2856f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -41,4 +41,5 @@ hr
 hu
 nb
 ru
+sr
 sv

From bbfe531d62a6fb4c25678844926bfa9fa8f2ba6e Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 09:59:53 +1100
Subject: [PATCH 05/99] Downgrade GNU Gettext to version 0.18.3

The Gnulib macros currently use Gettext version 0.18.3 in their m4 files.
---
 INSTALL            |  2 +-
 NEWS               |  3 +++
 configure.ac       |  2 +-
 m4/gnulib-cache.m4 |  3 +--
 po/Makefile.in.in  | 59 ++++++++++++++++------------------------------
 5 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/INSTALL b/INSTALL
index 398bc5c..cbdbdcf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ and installation:
     multibyte character sequences (such as UTF-8) require a wide-character
     version of Curses, such as NcursesW, to work correctly.
 
-4.  The GNU Gettext library, version 0.19.5 or later, to allow the game to
+4.  The GNU Gettext library, version 0.18.3 or later, to allow the game to
     use languages other than English;  this is also called Native Language
     Support.  If you do not have  this library (and do not wish to install
     it), you may pass "--disable-nls" to the configure script.
diff --git a/NEWS b/NEWS
index 10e2e00..d54028f 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ at http://www.zap.org.au/services/svn/.
 Version 7.10 (not yet released)
 -------------------------------
 
+Downgraded GNU Gettext to version 0.18.3, as the current Gnulib macros are
+from that version.
+
 Added the Serbian translation, with thanks to Мирослав Николић.
 
 
diff --git a/configure.ac b/configure.ac
index 96ff138..b62c387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.5])
+AM_GNU_GETTEXT_VERSION([0.18.3])
 
 gl_INIT
 
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2f6308c..64eea4a 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,7 +37,6 @@ gl_MODULES([
   config-h
   crc
   getopt-gnu
-  gettext
   gettext-h
   gettimeofday
   locale
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c36f1ad..fabdc76 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,13 +1,15 @@
 # Makefile for PO directory in any package using GNU gettext.
 # Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.19.5
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.18.3
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -75,16 +77,6 @@ POTFILES = \
 
 CATALOGS = @CATALOGS@
 
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -151,25 +143,15 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # heuristic whether some file in the top level directory mentions "GNU xyz".
 # If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	package_gnu="$(PACKAGE_GNU)"; \
-	test -n "$$package_gnu" || { \
-	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
-			       /dev/null '{}' ';' 2>/dev/null; \
-	       else \
-		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-	       fi; \
-	     } | grep -v 'libtool:' >/dev/null; then \
-	     package_gnu=yes; \
-	   else \
-	     package_gnu=no; \
-	   fi; \
-	}; \
-	if test "$$package_gnu" = "yes"; then \
-	  package_prefix='GNU '; \
+	if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+	       LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+	     else \
+	       LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	     fi; \
+	   } | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
 	else \
-	  package_prefix=''; \
+	  package_gnu=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -189,7 +171,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_prefix}@PACKAGE@" \
+	      --package-name="$${package_gnu}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -217,14 +199,13 @@ $(srcdir)/$(DOMAIN).pot:
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(POFILESDEPS)
+$(POFILES): $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
-	    && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
 	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
 	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
 	           *) \
@@ -381,7 +362,7 @@ maintainer-clean: distclean
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)

From e94985e77e07eeebc958f8ecf435d609ff173dc6 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 13:47:17 +1100
Subject: [PATCH 06/99] Clean up whitespacing, etc., in the Serbian translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change the whitespacing and word-wrapping of the help text, change the
padding and word-wrapping on various other strings, add the standard
header comment.  Also change a number of strings ("Y/N" to "Д/Н", "Ц" to
"Н", "Цајтсеф" to "Зајцеф").
---
 po/sr.po | 173 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 90 insertions(+), 83 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index bf05e2b..75bec5a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,22 +1,29 @@
-# Serbian translation for trader.
-# Copyright © 2016 Free Software Foundation, Inc.
+# *************************************************************************
+# *                                                                       *
+# *                 Serbian Translation for Star Traders                  *
+# *                   Copyright (C) 2016, John Zaitseff                   *
+# *          Copyright (C) 2016, Free Software Foundation, Inc.           *
+# *                                                                       *
+# *************************************************************************
+#
 # This file is distributed under the same license as the trader package.
 #
-# Translators: 
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+# Contributors:
+#   Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: trader-7.9\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 10:52+1100\n"
-"PO-Revision-Date: 2016-03-09 12:10+0200\n"
+"PO-Revision-Date: 2016-03-11 13:17+1100\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%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"
 
 #: src/trader.c:235
 #, c-format
@@ -57,15 +64,15 @@ msgid ""
 "NO WARRANTY, to the extent permitted by law; see the License for details.\n"
 msgstr ""
 "Звездани трговци (%s) %s\n"
-"Ауторска права © %s, Џон Цајтсеф.\n"
+"Ауторска права © %s, Џон Зајцеф (John Zaitseff).\n"
 "\n"
 "Звездани трговци је једноставна игра међузвезданог трговања, у којој треба\n"
 "да оснивате предузећа, купујете и продајете акције, позајмљујете и враћате\n"
 "новац, да бисте постали најбогатији играч (победник).\n"
 "\n"
 "Овај програм је слободан софтвер који се расподељује под условима Гнуове\n"
-"опште јавне лиценце, 3. издања или новијег. Можете слободно да га мењате\n"
-"и/или расподељујете под одређеним условима. Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
+"опште јавне лиценце, 3. издања или новијег.  Можете слободно да га мењате\n"
+"и/или расподељујете под одређеним условима.  Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
 "у мери у којој то допушта закон; погледајте лиценцу за више детаља.\n"
 
 #: src/trader.c:308
@@ -76,7 +83,7 @@ msgstr "%s: Пробајте „%s --help“ за више података.\n"
 #: src/trader.c:311
 #, c-format
 msgid "Usage: %s [OPTION ...] [GAME]\n"
-msgstr "Употреба: %s [ОПЦИЈА...] [ИГРА]\n"
+msgstr "Употреба: %s [ОПЦИЈА ...] [ИГРА]\n"
 
 #: src/trader.c:312
 #, c-format
@@ -111,8 +118,9 @@ msgid ""
 "playing that game.  If GAME is not specified, start a new game.\n"
 "\n"
 msgstr ""
-"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља\n"
-"са том игром.  Ако ИГРА није наведена, почиње нову игру.\n"
+"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља са том игром.\n"
+"Ако ИГРА није наведена, почиње нову игру.\n"
+"\n"
 
 #. TRANSLATORS: The first %s is the proper name of the package
 #. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
@@ -195,7 +203,7 @@ msgstr "Ждрал и Другари"
 #. Do not change or translate anything after the vertical line.
 #: src/globals.c:68
 msgid "ABCDEFGH|input|Companies"
-msgstr "АБВГДЂЕЖ"
+msgstr "АБВГДЂЕЖ|input|Companies"
 
 #. TRANSLATORS: This string specifies the keycodes used to select a
 #. game move.  There must be exactly 20 characters, one for each
@@ -206,7 +214,7 @@ msgstr "АБВГДЂЕЖ"
 #. the vertical line.
 #: src/globals.c:80
 msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
-msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР"
+msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР|input|GameMoves"
 
 #. TRANSLATORS: This string is used to display the galaxy map to
 #. screen.  There must be exactly 11 characters before the ASCII
@@ -217,7 +225,7 @@ msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР"
 #. handled correctly.
 #: src/globals.c:92
 msgid ".+*ABCDEFGH|output|MapVals"
-msgstr ".+*АБВГДЂЕЖ"
+msgstr ".+*АБВГДЂЕЖ|output|MapVals"
 
 #. TRANSLATORS: This string is used to display the game moves
 #. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
@@ -227,7 +235,7 @@ msgstr ".+*АБВГДЂЕЖ"
 #. Double-width characters ARE handled correctly.
 #: src/globals.c:103
 msgid "abcdefghijklmnopqrst|output|GameMoves"
-msgstr "абвгдђежзијклљмнњопр"
+msgstr "абвгдђежзијклљмнњопр|output|GameMoves"
 
 #. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
 #. Game Winner dialog box at the end of the game.  If ordinals depend
@@ -287,7 +295,7 @@ msgstr "Први играч на потезу је ^{%ls^}."
 #: src/game.c:259
 #, c-format
 msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
-msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Ц>^} да наставите игру: "
+msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Н>^} да наставите игру: "
 
 #. TRANSLATORS: This string specifies the keycodes used to continue a
 #. game; these must NOT contain any numeric digit from 1 to 9.  The
@@ -312,7 +320,7 @@ msgstr "Упишите ваше име: "
 #: src/game.c:425
 #, c-format
 msgid "Do you need any instructions? [^{Y^}/^{N^}] "
-msgstr "Да ли су вам потребна упутства? [^{Y^}/^{N^}] "
+msgstr "Да ли су вам потребна упутства? [^{Д^}/^{Н^}] "
 
 #: src/game.c:443
 #, c-format
@@ -327,7 +335,7 @@ msgstr "%d. играч: "
 #: src/game.c:529
 #, c-format
 msgid "Does any player need instructions? [^{Y^}/^{N^}] "
-msgstr "Да ли су неком играчу потребна упутства? [^{Y^}/^{N^}] "
+msgstr "Да ли су неком играчу потребна упутства? [^{Д^}/^{Н^}] "
 
 #: src/game.c:563
 #, c-format
@@ -417,7 +425,7 @@ msgstr "  Портфељ удела  "
 #: src/game.c:702
 #, c-format
 msgid "^[* * *   B A N K R U P T   * * *^]"
-msgstr "^[* * *  С Т Е Ч А Ј   * * *^]"
+msgstr "^[* * *   С Т Е Ч А Ј   * * *^]"
 
 #: src/game.c:717 src/exch.c:112
 #, c-format
@@ -509,25 +517,25 @@ msgstr ""
 #, c-format
 msgctxt "label"
 msgid "Total value:   "
-msgstr "Укупан износ:    "
+msgstr "Укупан износ:       "
 
 #: src/game.c:800 src/exch.c:324
 #, c-format
 msgctxt "label"
 msgid "Current cash:  "
-msgstr "Текућа готовина: "
+msgstr "Текућа готовина:    "
 
 #: src/game.c:807 src/exch.c:332
 #, c-format
 msgctxt "label"
 msgid "Current debt:  "
-msgstr "Текући дуг:      "
+msgstr "Текући дуг:         "
 
 #: src/game.c:813 src/exch.c:337
 #, c-format
 msgctxt "label"
 msgid "Interest rate: "
-msgstr "Каматна стопа: "
+msgstr "Каматна стопа:      "
 
 #. TRANSLATORS: Each label may be up to 37 characters wide
 #. (for <1> and <2>) or 38 characters wide (for <3> and
@@ -595,7 +603,7 @@ msgstr "^{<КТРЛ><Ц>^} (Изађите из игре)"
 #: src/move.c:375
 #, c-format
 msgid "Are you sure? [^{Y^}/^{N^}] "
-msgstr "Да ли сте сигурни? [^{Y^}/^{N^}] "
+msgstr "Да ли сте сигурни? [^{Д^}/^{Н^}] "
 
 #: src/move.c:392 src/move.c:470
 #, c-format
@@ -753,7 +761,7 @@ msgstr "Плаћени износ по акцији: "
 #, c-format
 msgctxt "label"
 msgid "Old share value:       "
-msgstr "Стара вредност акције:       "
+msgstr "Стара вредност акције:   "
 
 #: src/move.c:1211 src/move.c:1246 src/exch.c:321
 #, c-format
@@ -848,7 +856,7 @@ msgstr "Унесите избор [^[Слово предузећа^]/^{1^}-^{4^}
 #, c-format
 msgctxt "label"
 msgid "Credit limit:  "
-msgstr "Ограничење кредита:"
+msgstr "Ограничење кредита: "
 
 #. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
 #. from the Bank" menu options must all be the same length
@@ -1047,7 +1055,7 @@ msgstr[2] "Можете да купите ^{%'ld^} акција."
 #: src/exch.c:742
 #, c-format
 msgid "How many shares do you wish to purchase? "
-msgstr "Колико акција желите да купите?"
+msgstr "Колико акција желите да купите? "
 
 #: src/exch.c:763
 #, c-format
@@ -1070,7 +1078,7 @@ msgstr[2] "Можете да продате до ^{%'ld^} акција."
 #: src/exch.c:777
 #, c-format
 msgid "How many shares do you wish to sell? "
-msgstr "Колико акција желите да продате?"
+msgstr "Колико акција желите да продате? "
 
 #: src/exch.c:805
 #, c-format
@@ -1201,7 +1209,7 @@ msgstr "%s: сачувана под несагласним кодирањем з
 #: src/fileio.c:343
 #, c-format
 msgid "%s: illegal or missing field on line %d"
-msgstr "%s: недозвољено или недостаје поље у %d.реду"
+msgstr "%s: недозвољено или недостаје поље у %d. реду"
 
 #: src/fileio.c:479 src/fileio.c:501
 #, c-format
@@ -1319,16 +1327,16 @@ msgid ""
 "        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
 msgstr ""
-"^BЗвездани трговци^N  је једноставна игра међузвезданог трговања.  Циљ игре\n"
-"је да сакупите што је могуће веће богатство. То ћете постићи оснивањем\n"
-"међузвезданих трговачких путева, њиховим проширивањем и куповањем акција у\n"
-"предузећима која њима управљају. Акцијама расте вредност како предузеће\n"
-"буде повећавало пословање. Поред тога, зарада на свакој акцији (у процентима)\n"
-"се такође мења. Играчи такође могу позајмити новац од Међузвездане Трговачке Банке\n"
-"да би финансирали додатне куповине на берзи.\n"
+"^BЗвездани трговци^N је једноставна игра међузвезданог трговања.  Циљ игре је да\n"
+"сакупите што је  могуће веће богатство.  То ћете  постићи оснивањем међузве-\n"
+"зданих трговачких путева, њиховим проширивањем и куповањем акција у предузе-\n"
+"ћима која њима управљају.  Акцијама расте вредност како предузеће буде пове-\n"
+"ћавало пословање.   Поред тога,  зарада на свакој акцији  (у процентима)  се\n"
+"такође мења.  Играчи  такође могу позајмити новац  од Међузвездане Трговачке\n"
+"Банке да би финансирали додатне куповине на берзи.\n"
 "\n"
-"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени\n"
-"приказ одељка галаксије може бити:\n"
+"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени приказ\n"
+"одељка галаксије може бити:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N представља ^Bпразан простор^N,\n"
@@ -1354,8 +1362,8 @@ msgid ""
 "will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
 "selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
 msgstr ""
-"Рачунар бира ^B~m^N потеза  (означених од ^k~1^N до ^k~M^N) насумично, и поставља\n"
-"их на карти.  Да изаберете било који од истакнутих положаја, притисните то слово.\n"
+"Рачунар бира  ^B~m^N потеза  (означених  од ^k~1^N до ^k~M^N) насумично,  и поставља их на\n"
+"карти.  Да изаберете било који од истакнутих положаја,  притисните то слово.\n"
 "На пример, неки од потеза на карти може бити:\n"
 "\n"
 "\n"
@@ -1366,9 +1374,9 @@ msgstr ""
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
 "\n"
 "\n"
-"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N)\n"
-"ће подесити ^Bиспоставу^N, која не припада ни једном предузећу. Стога, ако је потез ^k~3^N\n"
-"изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
+"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N) ће по-\n"
+"десити ^Bиспоставу^N,  која не припада ни једном предузећу.  Стога, ако је потез\n"
+"^k~3^N изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
 
 #: src/help.c:150
 msgid ""
@@ -1388,15 +1396,15 @@ msgid ""
 "        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
 msgstr ""
-"Ако је, у другом случају, положај поред звезде  (или друге испоставе)\n"
-"изабран, ^Bпредузеће^N ће се основати а његово слово ће се појавити на\n"
-"карти. Као награда за оснивање предузећа, зарађујете првих пет акција.\n"
-"На овај начин се могу основати ^B~c^N предузећа.\n"
+"Ако је,  у другом случају,  положај поред звезде  (или друге испоставе) иза-\n"
+"бран, ^Bпредузеће^N ће се основати а његово слово  ће се појавити на карти.  Као\n"
+"награда за оснивање  предузећа,  зарађујете првих пет акција.  На овај начин\n"
+"се могу основати ^B~c^N предузећа.\n"
 "\n"
-"Ако је положај поред постојећег предузећа изабран, предузеће неће повећати\n"
-"своје деловање за један квадрат. Ово повећава трошкове његових акција а са\n"
-"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод,\n"
-"бирање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
+"Ако је положај поред  постојећег предузећа изабран,  предузеће неће повећати\n"
+"своје деловање за један квадрат.  Ово повећава трошкове  његових акција а са\n"
+"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод, би-\n"
+"рање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
 "\n"
 "        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
@@ -1422,9 +1430,9 @@ msgid ""
 "more valuable:  the company's share price  will increase by a greater amount\n"
 "than it would for outposts not next to stars.\n"
 msgstr ""
-"Бирање положаја поред звезда повећава вредност ваших залиха око пет пута\n"
-"у односу на проширење које није поред звезде.  Стога потез ^k~6^N треба\n"
-"да има предност над потезом ^k~8^N.\n"
+"Бирање положаја  поред звезда повећава вредност ваших залиха  око пет пута у\n"
+"односу на проширење  које није  поред звезде.  Стога потез  ^k~6^N  треба  да има\n"
+"предност над потезом ^k~8^N.\n"
 "\n"
 "        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
@@ -1432,9 +1440,9 @@ msgstr ""
 "        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
 "\n"
-"Можете такође да проширите било које предузеће бирајући положај поред испостава.\n"
-"Такве испоставе биће прогутане тим предузећем. Стога ће, потез ^k~1^N проширити\n"
-"предузеће ^B~C^N за ^Bдва^N квадрата. Као бонус, испоставе поред звезда су\n"
+"Можете такође да проширите било  које предузеће бирајући положај поред испо-\n"
+"става.  Такве испоставе  биће прогутане тим предузећем.  Стога ће,  потез  ^k~1^N\n"
+"проширити предузеће ^B~C^N за ^Bдва^N квадрата.  Као бонус, испоставе поред звезда су\n"
 "вредније:  цена акције предузећа ће се повећати већим износом него што би то\n"
 "било за испоставе које нису поред звезда.\n"
 
@@ -1458,21 +1466,21 @@ msgid ""
 "is also paid, proportional to the percentage of the old company owned.\n"
 msgstr ""
 "Ако су два предузећа одвојена на карти само једним квадратом, тада могу бити\n"
-"^Bспојена^N у једно предузеће бирањем тог положаја (ако је доступан). На пример,\n"
-"на карти испод, предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.\n"
-"Када до тога дође, предузеће  са већом вредношћу добара  преузима ово друго.\n"
-"Овде, предузеће ^B~B^N може да преузме предузеће ^B~A^N. Предузеће ^B~A^N престаје\n"
-"да постоји, иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
+"^Bспојена^N у једно предузеће  бирањем тог положаја  (ако је доступан).  На при-\n"
+"мер, на карти испод,  предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.  Када до\n"
+"тога дође,  предузеће са већом  вредношћу добара преузима  ово друго.  Овде,\n"
+"предузеће ^B~B^N може  да преузме предузеће ^B~A^N.  Предузеће ^B~A^N  престаје да постоји,\n"
+"иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
 "\n"
 "        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
-"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
-"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
 "        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
-"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
 "\n"
-"Када се предузећа споје, играчима се одобравају акције у доминантном предузећу\n"
-"пропорционално поседованом износу у старом предузећу. Такође, готовински бонус\n"
-"се такође плаћа, пропорционално проценту поседништва старог предузећа.\n"
+"Када се предузећа споје,  играчима се одобравају акције у доминантном преду-\n"
+"зећу пропорционално поседованом износу у старом предузећу.  Такође, готовин-\n"
+"ски бонус се такође плаћа, пропорционално проценту поседништва старог преду-\n"
+"зећа.\n"
 
 #: src/help.c:205
 msgid ""
@@ -1493,22 +1501,21 @@ msgid ""
 "The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
 "value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
 msgstr ""
-"Након што изаберете ваш потез, упишите ^BМеђузвездана берза^N.  Овде можете\n"
-"да купите акције,  да их продате, да позајмите новац од Трговачке Банке или\n"
-"да отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће\n"
-"издаје ограничени број акција — не можете куповати заувек!  Можете, међутим,\n"
-"да затражите издавање још акција. Веће су вам шансе за успех ако поседујете\n"
+"Након што изаберете  ваш потез, упишите  ^BМеђузвездана берза^N.  Овде можете да\n"
+"купите акције,  да их продате, да позајмите новац  од Трговачке Банке или да\n"
+"отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће изда-\n"
+"је ограничени број акција — не можете куповати заувек!  Можете,  међутим, да\n"
+"затражите  издавање још акција.  Веће су вам  шансе за успех  ако поседујете\n"
 "већи део предузећа.\n"
 "\n"
-"Игра се обично завршава након ^B~t^N круга. Међутим, можете да завршите игру\n"
-"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете\n"
-"потез. Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
-"време. Ако је ваш дуг поприлично велик, Банка може то да уради уместо вас!\n"
+"Игра се обично  завршава након  ^B~t^N круга.  Међутим,  можете да завршите игру\n"
+"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете по-\n"
+"тез.  Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
+"време.  Ако је ваш дуг поприлично велик,  Банка може то да уради уместо вас!\n"
 "Ако не довршите игру за време које вам је на располагању, можете да сачувате\n"
 "игру и касније да је наставите.\n"
 "\n"
-"\n"
-"^BПобедник игре^N је играч са највећом нето вредношћу (укупан износ готовине,\n"
+"^BПобедник игре^N је играч  са највећом  нето вредношћу  (укупан износ готовине,\n"
 "залиха и дуговања).  ^HСрећно^N и нека победи најбољи!\n"
 
 #: src/help.c:225
@@ -1613,12 +1620,12 @@ msgstr "gettxline: недозвољени знак у нисци: „%ls“"
 #: src/intf.c:2952
 msgctxt "input|Yes"
 msgid "Yy"
-msgstr "Yy"
+msgstr "Дд"
 
 #: src/intf.c:2954
 msgctxt "input|No"
 msgid "Nn"
-msgstr "Nn"
+msgstr "Нн"
 
 #. TRANSLATORS: The strings "Yes" and "No" are printed as a
 #. response to user input in answer to questions like "Are you

From 7d64ab97171eff9ef5ab4ac15452594212ac65e5 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 11 Mar 2016 16:47:14 +1100
Subject: [PATCH 07/99] Add a data directory for non-code data

---
 Makefile.am      |  2 +-
 NEWS             |  3 +++
 configure.ac     |  1 +
 data/Makefile.am | 29 +++++++++++++++++++++++++++++
 data/README      |  9 +++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 data/Makefile.am
 create mode 100644 data/README

diff --git a/Makefile.am b/Makefile.am
index d7abee5..d0f5c17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Subdirectories to recurse into
-SUBDIRS = lib src doc po m4
+SUBDIRS = lib src data doc po m4
 
 # Additional files to distribute
 EXTRA_DIST = build-aux/bootstrap
diff --git a/NEWS b/NEWS
index d54028f..d82bca7 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ at http://www.zap.org.au/services/svn/.
 Version 7.10 (not yet released)
 -------------------------------
 
+Added a data directory that will contain a desktop file and appropriate
+icons.
+
 Downgraded GNU Gettext to version 0.18.3, as the current Gnulib macros are
 from that version.
 
diff --git a/configure.ac b/configure.ac
index b62c387..7a82dc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_CONFIG_FILES([
 	Makefile
 	lib/Makefile
 	src/Makefile
+	data/Makefile
 	doc/Makefile
 	po/Makefile.in
 	m4/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..848e664
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,29 @@
+#########################################################################
+#                                                                       #
+#             Star Traders: A Game of Interstellar Trading              #
+#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                                                                       #
+#########################################################################
+
+# Author: John Zaitseff <J.Zaitseff@zap.org.au>
+# $Id$
+#
+# This file, data/Makefile.am, contains the non-code data directory
+# Makefile for Star Traders.  It needs to be processed by automake to
+# produce the corresponding Makefile.in.
+#
+#
+# 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 3 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, see http://www.gnu.org/licenses/.
+
+EXTRA_DIST     = README
diff --git a/data/README b/data/README
new file mode 100644
index 0000000..0f93686
--- /dev/null
+++ b/data/README
@@ -0,0 +1,9 @@
+**************************************************************************
+*                                                                        *
+*              Star Traders: A Game of Interstellar Trading              *
+*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                                                                        *
+**************************************************************************
+
+This directory, data, contains non-code data related to  Star Traders.  In
+particular, the desktop file and icons are located here.

From 3553821a5c6a9591bbe3b4795e00f60789d059f0 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 26 Mar 2016 15:51:57 +1100
Subject: [PATCH 08/99] Update sr.po to the latest version from the Translation
 Project

---
 po/sr.po | 179 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 93 insertions(+), 86 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index bf05e2b..5d2e85d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,22 +1,29 @@
-# Serbian translation for trader.
-# Copyright © 2016 Free Software Foundation, Inc.
+# *************************************************************************
+# *                                                                       *
+# *                 Serbian Translation for Star Traders                  *
+# *                   Copyright (C) 2016, John Zaitseff                   *
+# *          Copyright (C) 2016, Free Software Foundation, Inc.           *
+# *                                                                       *
+# *************************************************************************
+#
 # This file is distributed under the same license as the trader package.
 #
-# Translators: 
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+# Contributors:
+#   Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: trader-7.9\n"
+"Project-Id-Version: trader 7.9\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-01-05 10:52+1100\n"
-"PO-Revision-Date: 2016-03-09 12:10+0200\n"
+"PO-Revision-Date: 2016-03-21 13:17+1100\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%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"
 
 #: src/trader.c:235
 #, c-format
@@ -57,15 +64,15 @@ msgid ""
 "NO WARRANTY, to the extent permitted by law; see the License for details.\n"
 msgstr ""
 "Звездани трговци (%s) %s\n"
-"Ауторска права © %s, Џон Цајтсеф.\n"
+"Ауторска права © %s, Џон Зајцеф (John Zaitseff).\n"
 "\n"
 "Звездани трговци је једноставна игра међузвезданог трговања, у којој треба\n"
 "да оснивате предузећа, купујете и продајете акције, позајмљујете и враћате\n"
 "новац, да бисте постали најбогатији играч (победник).\n"
 "\n"
 "Овај програм је слободан софтвер који се расподељује под условима Гнуове\n"
-"опште јавне лиценце, 3. издања или новијег. Можете слободно да га мењате\n"
-"и/или расподељујете под одређеним условима. Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
+"опште јавне лиценце, 3. издања или новијег.  Можете слободно да га мењате\n"
+"и/или расподељујете под одређеним условима.  Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
 "у мери у којој то допушта закон; погледајте лиценцу за више детаља.\n"
 
 #: src/trader.c:308
@@ -76,7 +83,7 @@ msgstr "%s: Пробајте „%s --help“ за више података.\n"
 #: src/trader.c:311
 #, c-format
 msgid "Usage: %s [OPTION ...] [GAME]\n"
-msgstr "Употреба: %s [ОПЦИЈА...] [ИГРА]\n"
+msgstr "Употреба: %s [ОПЦИЈА ...] [ИГРА]\n"
 
 #: src/trader.c:312
 #, c-format
@@ -111,8 +118,9 @@ msgid ""
 "playing that game.  If GAME is not specified, start a new game.\n"
 "\n"
 msgstr ""
-"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља\n"
-"са том игром.  Ако ИГРА није наведена, почиње нову игру.\n"
+"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља са том игром.\n"
+"Ако ИГРА није наведена, почиње нову игру.\n"
+"\n"
 
 #. TRANSLATORS: The first %s is the proper name of the package
 #. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
@@ -195,7 +203,7 @@ msgstr "Ждрал и Другари"
 #. Do not change or translate anything after the vertical line.
 #: src/globals.c:68
 msgid "ABCDEFGH|input|Companies"
-msgstr "АБВГДЂЕЖ"
+msgstr "АБВГДЂЕЖ|input|Companies"
 
 #. TRANSLATORS: This string specifies the keycodes used to select a
 #. game move.  There must be exactly 20 characters, one for each
@@ -206,7 +214,7 @@ msgstr "АБВГДЂЕЖ"
 #. the vertical line.
 #: src/globals.c:80
 msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
-msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР"
+msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР|input|GameMoves"
 
 #. TRANSLATORS: This string is used to display the galaxy map to
 #. screen.  There must be exactly 11 characters before the ASCII
@@ -217,7 +225,7 @@ msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР"
 #. handled correctly.
 #: src/globals.c:92
 msgid ".+*ABCDEFGH|output|MapVals"
-msgstr ".+*АБВГДЂЕЖ"
+msgstr ".+*АБВГДЂЕЖ|output|MapVals"
 
 #. TRANSLATORS: This string is used to display the game moves
 #. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
@@ -227,7 +235,7 @@ msgstr ".+*АБВГДЂЕЖ"
 #. Double-width characters ARE handled correctly.
 #: src/globals.c:103
 msgid "abcdefghijklmnopqrst|output|GameMoves"
-msgstr "абвгдђежзијклљмнњопр"
+msgstr "абвгдђежзијклљмнњопр|output|GameMoves"
 
 #. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
 #. Game Winner dialog box at the end of the game.  If ordinals depend
@@ -287,7 +295,7 @@ msgstr "Први играч на потезу је ^{%ls^}."
 #: src/game.c:259
 #, c-format
 msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
-msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Ц>^} да наставите игру: "
+msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Н>^} да наставите игру: "
 
 #. TRANSLATORS: This string specifies the keycodes used to continue a
 #. game; these must NOT contain any numeric digit from 1 to 9.  The
@@ -312,7 +320,7 @@ msgstr "Упишите ваше име: "
 #: src/game.c:425
 #, c-format
 msgid "Do you need any instructions? [^{Y^}/^{N^}] "
-msgstr "Да ли су вам потребна упутства? [^{Y^}/^{N^}] "
+msgstr "Да ли су вам потребна упутства? [^{Д^}/^{Н^}] "
 
 #: src/game.c:443
 #, c-format
@@ -327,7 +335,7 @@ msgstr "%d. играч: "
 #: src/game.c:529
 #, c-format
 msgid "Does any player need instructions? [^{Y^}/^{N^}] "
-msgstr "Да ли су неком играчу потребна упутства? [^{Y^}/^{N^}] "
+msgstr "Да ли су неком играчу потребна упутства? [^{Д^}/^{Н^}] "
 
 #: src/game.c:563
 #, c-format
@@ -417,7 +425,7 @@ msgstr "  Портфељ удела  "
 #: src/game.c:702
 #, c-format
 msgid "^[* * *   B A N K R U P T   * * *^]"
-msgstr "^[* * *  С Т Е Ч А Ј   * * *^]"
+msgstr "^[* * *   С Т Е Ч А Ј   * * *^]"
 
 #: src/game.c:717 src/exch.c:112
 #, c-format
@@ -509,25 +517,25 @@ msgstr ""
 #, c-format
 msgctxt "label"
 msgid "Total value:   "
-msgstr "Укупан износ:    "
+msgstr "Укупан износ:       "
 
 #: src/game.c:800 src/exch.c:324
 #, c-format
 msgctxt "label"
 msgid "Current cash:  "
-msgstr "Текућа готовина: "
+msgstr "Текућа готовина:    "
 
 #: src/game.c:807 src/exch.c:332
 #, c-format
 msgctxt "label"
 msgid "Current debt:  "
-msgstr "Текући дуг:      "
+msgstr "Текући дуг:         "
 
 #: src/game.c:813 src/exch.c:337
 #, c-format
 msgctxt "label"
 msgid "Interest rate: "
-msgstr "Каматна стопа: "
+msgstr "Каматна стопа:      "
 
 #. TRANSLATORS: Each label may be up to 37 characters wide
 #. (for <1> and <2>) or 38 characters wide (for <3> and
@@ -595,7 +603,7 @@ msgstr "^{<КТРЛ><Ц>^} (Изађите из игре)"
 #: src/move.c:375
 #, c-format
 msgid "Are you sure? [^{Y^}/^{N^}] "
-msgstr "Да ли сте сигурни? [^{Y^}/^{N^}] "
+msgstr "Да ли сте сигурни? [^{Д^}/^{Н^}] "
 
 #: src/move.c:392 src/move.c:470
 #, c-format
@@ -715,7 +723,7 @@ msgid ""
 "\n"
 "^{All assets have been taken to repay outstanding loans.^}"
 msgstr ""
-"Међузвездана Трговачка Банка је објавила стечај играчу %ls.\n"
+"Међузвездана Трговачка Банка је објавила стечај предузећу %ls.\n"
 "\n"
 "^{Сва добра су одузета зарад отплаћивања основних зајмова.^}"
 
@@ -727,7 +735,7 @@ msgid ""
 "\n"
 "^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
 msgstr ""
-"Међузвездана Трговачка Банка је објавила стечај играчу %ls.\n"
+"Међузвездана Трговачка Банка је објавила стечај предузећу %ls.\n"
 "\n"
 "^{Банка је пристала да исплати акционарима ^}%.2f%%^{ од вредности акције по свакој поседованој акцији.^}"
 
@@ -753,7 +761,7 @@ msgstr "Плаћени износ по акцији: "
 #, c-format
 msgctxt "label"
 msgid "Old share value:       "
-msgstr "Стара вредност акције:       "
+msgstr "Стара вредност акције:   "
 
 #: src/move.c:1211 src/move.c:1246 src/exch.c:321
 #, c-format
@@ -848,7 +856,7 @@ msgstr "Унесите избор [^[Слово предузећа^]/^{1^}-^{4^}
 #, c-format
 msgctxt "label"
 msgid "Credit limit:  "
-msgstr "Ограничење кредита:"
+msgstr "Ограничење кредита: "
 
 #. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
 #. from the Bank" menu options must all be the same length
@@ -1000,7 +1008,7 @@ msgstr "^{<2>^} Препродајте удео предузећу"
 #: src/exch.c:658
 #, c-format
 msgid "^{<3>^} Bid company to issue more shares"
-msgstr "^{<3>^} Тражите од предузећа да изда акције"
+msgstr "^{<3>^} Тражите предузећу да изда акције"
 
 #: src/exch.c:660
 #, c-format
@@ -1047,7 +1055,7 @@ msgstr[2] "Можете да купите ^{%'ld^} акција."
 #: src/exch.c:742
 #, c-format
 msgid "How many shares do you wish to purchase? "
-msgstr "Колико акција желите да купите?"
+msgstr "Колико акција желите да купите? "
 
 #: src/exch.c:763
 #, c-format
@@ -1070,7 +1078,7 @@ msgstr[2] "Можете да продате до ^{%'ld^} акција."
 #: src/exch.c:777
 #, c-format
 msgid "How many shares do you wish to sell? "
-msgstr "Колико акција желите да продате?"
+msgstr "Колико акција желите да продате? "
 
 #: src/exch.c:805
 #, c-format
@@ -1201,7 +1209,7 @@ msgstr "%s: сачувана под несагласним кодирањем з
 #: src/fileio.c:343
 #, c-format
 msgid "%s: illegal or missing field on line %d"
-msgstr "%s: недозвољено или недостаје поље у %d.реду"
+msgstr "%s: недозвољено или недостаје поље у %d. реду"
 
 #: src/fileio.c:479 src/fileio.c:501
 #, c-format
@@ -1319,16 +1327,16 @@ msgid ""
 "        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
 msgstr ""
-"^BЗвездани трговци^N  је једноставна игра међузвезданог трговања.  Циљ игре\n"
-"је да сакупите што је могуће веће богатство. То ћете постићи оснивањем\n"
-"међузвезданих трговачких путева, њиховим проширивањем и куповањем акција у\n"
-"предузећима која њима управљају. Акцијама расте вредност како предузеће\n"
-"буде повећавало пословање. Поред тога, зарада на свакој акцији (у процентима)\n"
-"се такође мења. Играчи такође могу позајмити новац од Међузвездане Трговачке Банке\n"
-"да би финансирали додатне куповине на берзи.\n"
+"^BЗвездани трговци^N је једноставна игра међузвезданог трговања.  Циљ игре је да\n"
+"сакупите што је  могуће веће богатство.  То ћете  постићи оснивањем међузве-\n"
+"зданих трговачких путева, њиховим проширивањем и куповањем акција у предузе-\n"
+"ћима која њима управљају.  Акцијама расте вредност како предузеће буде пове-\n"
+"ћавало пословање.   Поред тога,  зарада на свакој акцији  (у процентима)  се\n"
+"такође мења.  Играчи  такође могу позајмити новац  од Међузвездане Трговачке\n"
+"Банке да би финансирали додатне куповине на берзи.\n"
 "\n"
-"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени\n"
-"приказ одељка галаксије може бити:\n"
+"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени приказ\n"
+"одељка галаксије може бити:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N представља ^Bпразан простор^N,\n"
@@ -1354,8 +1362,8 @@ msgid ""
 "will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
 "selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
 msgstr ""
-"Рачунар бира ^B~m^N потеза  (означених од ^k~1^N до ^k~M^N) насумично, и поставља\n"
-"их на карти.  Да изаберете било који од истакнутих положаја, притисните то слово.\n"
+"Рачунар бира  ^B~m^N потеза  (означених  од ^k~1^N до ^k~M^N) насумично,  и поставља их на\n"
+"карти.  Да изаберете било који од истакнутих положаја,  притисните то слово.\n"
 "На пример, неки од потеза на карти може бити:\n"
 "\n"
 "\n"
@@ -1366,9 +1374,9 @@ msgstr ""
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
 "\n"
 "\n"
-"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N)\n"
-"ће подесити ^Bиспоставу^N, која не припада ни једном предузећу. Стога, ако је потез ^k~3^N\n"
-"изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
+"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N) ће по-\n"
+"десити ^Bиспоставу^N,  која не припада ни једном предузећу.  Стога, ако је потез\n"
+"^k~3^N изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
 
 #: src/help.c:150
 msgid ""
@@ -1388,15 +1396,15 @@ msgid ""
 "        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
 msgstr ""
-"Ако је, у другом случају, положај поред звезде  (или друге испоставе)\n"
-"изабран, ^Bпредузеће^N ће се основати а његово слово ће се појавити на\n"
-"карти. Као награда за оснивање предузећа, зарађујете првих пет акција.\n"
-"На овај начин се могу основати ^B~c^N предузећа.\n"
+"Ако је,  у другом случају,  положај поред звезде  (или друге испоставе) иза-\n"
+"бран, ^Bпредузеће^N ће се основати а његово слово  ће се појавити на карти.  Као\n"
+"награда за оснивање  предузећа,  зарађујете првих пет акција.  На овај начин\n"
+"се могу основати ^B~c^N предузећа.\n"
 "\n"
-"Ако је положај поред постојећег предузећа изабран, предузеће неће повећати\n"
-"своје деловање за један квадрат. Ово повећава трошкове његових акција а са\n"
-"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод,\n"
-"бирање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
+"Ако је положај поред  постојећег предузећа изабран,  предузеће неће повећати\n"
+"своје деловање за један квадрат.  Ово повећава трошкове  његових акција а са\n"
+"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод, би-\n"
+"рање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
 "\n"
 "        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
@@ -1422,9 +1430,9 @@ msgid ""
 "more valuable:  the company's share price  will increase by a greater amount\n"
 "than it would for outposts not next to stars.\n"
 msgstr ""
-"Бирање положаја поред звезда повећава вредност ваших залиха око пет пута\n"
-"у односу на проширење које није поред звезде.  Стога потез ^k~6^N треба\n"
-"да има предност над потезом ^k~8^N.\n"
+"Бирање положаја  поред звезда повећава вредност ваших залиха  око пет пута у\n"
+"односу на проширење  које није  поред звезде.  Стога потез  ^k~6^N  треба  да има\n"
+"предност над потезом ^k~8^N.\n"
 "\n"
 "        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
@@ -1432,9 +1440,9 @@ msgstr ""
 "        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
 "        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
 "\n"
-"Можете такође да проширите било које предузеће бирајући положај поред испостава.\n"
-"Такве испоставе биће прогутане тим предузећем. Стога ће, потез ^k~1^N проширити\n"
-"предузеће ^B~C^N за ^Bдва^N квадрата. Као бонус, испоставе поред звезда су\n"
+"Можете такође да проширите било  које предузеће бирајући положај поред испо-\n"
+"става.  Такве испоставе  биће прогутане тим предузећем.  Стога ће,  потез  ^k~1^N\n"
+"проширити предузеће ^B~C^N за ^Bдва^N квадрата.  Као бонус, испоставе поред звезда су\n"
 "вредније:  цена акције предузећа ће се повећати већим износом него што би то\n"
 "било за испоставе које нису поред звезда.\n"
 
@@ -1458,21 +1466,21 @@ msgid ""
 "is also paid, proportional to the percentage of the old company owned.\n"
 msgstr ""
 "Ако су два предузећа одвојена на карти само једним квадратом, тада могу бити\n"
-"^Bспојена^N у једно предузеће бирањем тог положаја (ако је доступан). На пример,\n"
-"на карти испод, предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.\n"
-"Када до тога дође, предузеће  са већом вредношћу добара  преузима ово друго.\n"
-"Овде, предузеће ^B~B^N може да преузме предузеће ^B~A^N. Предузеће ^B~A^N престаје\n"
-"да постоји, иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
+"^Bспојена^N у једно предузеће  бирањем тог положаја  (ако је доступан).  На при-\n"
+"мер, на карти испод,  предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.  Када до\n"
+"тога дође,  предузеће са већом  вредношћу добара преузима  ово друго.  Овде,\n"
+"предузеће ^B~B^N може  да преузме предузеће ^B~A^N.  Предузеће ^B~A^N  престаје да постоји,\n"
+"иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
 "\n"
 "        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
-"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
-"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
 "        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
-"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
 "\n"
-"Када се предузећа споје, играчима се одобравају акције у доминантном предузећу\n"
-"пропорционално поседованом износу у старом предузећу. Такође, готовински бонус\n"
-"се такође плаћа, пропорционално проценту поседништва старог предузећа.\n"
+"Када се предузећа споје,  играчима се одобравају акције у доминантном преду-\n"
+"зећу пропорционално поседованом износу у старом предузећу.  Такође, готовин-\n"
+"ски бонус се такође плаћа, пропорционално проценту поседништва старог преду-\n"
+"зећа.\n"
 
 #: src/help.c:205
 msgid ""
@@ -1493,22 +1501,21 @@ msgid ""
 "The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
 "value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
 msgstr ""
-"Након што изаберете ваш потез, упишите ^BМеђузвездана берза^N.  Овде можете\n"
-"да купите акције,  да их продате, да позајмите новац од Трговачке Банке или\n"
-"да отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће\n"
-"издаје ограничени број акција — не можете куповати заувек!  Можете, међутим,\n"
-"да затражите издавање још акција. Веће су вам шансе за успех ако поседујете\n"
+"Након што изаберете  ваш потез, упишите  ^BМеђузвездана берза^N.  Овде можете да\n"
+"купите акције,  да их продате, да позајмите новац  од Трговачке Банке или да\n"
+"отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће изда-\n"
+"је ограничени број акција — не можете куповати заувек!  Можете,  међутим, да\n"
+"затражите  издавање још акција.  Веће су вам  шансе за успех  ако поседујете\n"
 "већи део предузећа.\n"
 "\n"
-"Игра се обично завршава након ^B~t^N круга. Међутим, можете да завршите игру\n"
-"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете\n"
-"потез. Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
-"време. Ако је ваш дуг поприлично велик, Банка може то да уради уместо вас!\n"
+"Игра се обично  завршава након  ^B~t^N круга.  Међутим,  можете да завршите игру\n"
+"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете по-\n"
+"тез.  Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
+"време.  Ако је ваш дуг поприлично велик,  Банка може то да уради уместо вас!\n"
 "Ако не довршите игру за време које вам је на располагању, можете да сачувате\n"
 "игру и касније да је наставите.\n"
 "\n"
-"\n"
-"^BПобедник игре^N је играч са највећом нето вредношћу (укупан износ готовине,\n"
+"^BПобедник игре^N је играч  са највећом  нето вредношћу  (укупан износ готовине,\n"
 "залиха и дуговања).  ^HСрећно^N и нека победи најбољи!\n"
 
 #: src/help.c:225
@@ -1613,12 +1620,12 @@ msgstr "gettxline: недозвољени знак у нисци: „%ls“"
 #: src/intf.c:2952
 msgctxt "input|Yes"
 msgid "Yy"
-msgstr "Yy"
+msgstr "Дд"
 
 #: src/intf.c:2954
 msgctxt "input|No"
 msgid "Nn"
-msgstr "Nn"
+msgstr "Нн"
 
 #. TRANSLATORS: The strings "Yes" and "No" are printed as a
 #. response to user input in answer to questions like "Are you

From 6adb3fee48899481b2915e1125d87fe9cffe323d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 06:32:57 +1000
Subject: [PATCH 09/99] Upgrade GNU Gettext to version 0.19.5

The Gnulib macros have finally caught up to this version.
---
 INSTALL           |  2 +-
 NEWS              |  3 ---
 configure.ac      |  2 +-
 po/Makefile.in.in | 59 +++++++++++++++++++++++++++++++----------------
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/INSTALL b/INSTALL
index cbdbdcf..398bc5c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ and installation:
     multibyte character sequences (such as UTF-8) require a wide-character
     version of Curses, such as NcursesW, to work correctly.
 
-4.  The GNU Gettext library, version 0.18.3 or later, to allow the game to
+4.  The GNU Gettext library, version 0.19.5 or later, to allow the game to
     use languages other than English;  this is also called Native Language
     Support.  If you do not have  this library (and do not wish to install
     it), you may pass "--disable-nls" to the configure script.
diff --git a/NEWS b/NEWS
index d82bca7..9ad6ae7 100644
--- a/NEWS
+++ b/NEWS
@@ -21,9 +21,6 @@ Version 7.10 (not yet released)
 Added a data directory that will contain a desktop file and appropriate
 icons.
 
-Downgraded GNU Gettext to version 0.18.3, as the current Gnulib macros are
-from that version.
-
 Added the Serbian translation, with thanks to Мирослав Николић.
 
 
diff --git a/configure.ac b/configure.ac
index 7a82dc4..f16bfa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_GNU_GETTEXT_VERSION([0.19.5])
 
 gl_INIT
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fabdc76..c36f1ad 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,15 +1,13 @@
 # Makefile for PO directory in any package using GNU gettext.
 # Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 #
-# Origin: gettext-0.18.3
-GETTEXT_MACRO_VERSION = 0.18
+# Origin: gettext-0.19.5
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -77,6 +75,16 @@ POTFILES = \
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -143,15 +151,25 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # heuristic whether some file in the top level directory mentions "GNU xyz".
 # If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-	       LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
-	     else \
-	       LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-	     fi; \
-	   } | grep -v 'libtool:' >/dev/null; then \
-	  package_gnu='GNU '; \
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
 	else \
-	  package_gnu=''; \
+	  package_prefix=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -171,7 +189,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-name="$${package_prefix}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -199,13 +217,14 @@ $(srcdir)/$(DOMAIN).pot:
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
-	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	    && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
 	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
 	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
 	           *) \
@@ -362,7 +381,7 @@ maintainer-clean: distclean
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	$(MAKE) update-po
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)

From a0a7961108c3b67d892aa994229a1bf52f22140b Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 06:49:54 +1000
Subject: [PATCH 10/99] Update the list of files to ignore

---
 lib/.gitignore | 2 ++
 m4/.gitignore  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib/.gitignore b/lib/.gitignore
index a23c7e3..1970414 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -14,6 +14,8 @@ getopt1.c
 getopt_int.h
 gettext.h
 gettimeofday.c
+hard-locale.c
+hard-locale.h
 iconv.c
 iconv.in.h
 iconv_close.c
diff --git a/m4/.gitignore b/m4/.gitignore
index e6582ea..fa95958 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -16,6 +16,7 @@ glibc21.m4
 gnulib-common.m4
 gnulib-comp.m4
 gnulib-tool.m4
+hard-locale.m4
 iconv.m4
 iconv_h.m4
 iconv_open.m4

From ed336248d782abe687171a1f473445b9fe7b6c0c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 06:57:38 +1000
Subject: [PATCH 11/99] Reinstate the Gnulib "gettext" module

This allows the GNU Gettext version 0.19.5 autoconf macros to be used on
systems that may have only older versions installed.
---
 m4/gnulib-cache.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 64eea4a..2f6308c 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,6 +37,7 @@ gl_MODULES([
   config-h
   crc
   getopt-gnu
+  gettext
   gettext-h
   gettimeofday
   locale

From 5edd10177c6c07feb6383bc3df0b2eaa027d34aa Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 07:39:51 +1000
Subject: [PATCH 12/99] Ensure no label has to start with a new-line character

---
 NEWS        |  6 ++++++
 po/da.po    | 27 +++++++++++++--------------
 po/de.po    | 27 +++++++++++++--------------
 po/en_AU.po | 27 +++++++++++++--------------
 po/en_CA.po | 27 +++++++++++++--------------
 po/en_GB.po | 27 +++++++++++++--------------
 po/en_US.po | 27 +++++++++++++--------------
 po/eo.po    | 27 +++++++++++++--------------
 po/fi.po    | 25 ++++++++++++-------------
 po/fr.po    | 27 +++++++++++++--------------
 po/hr.po    | 27 +++++++++++++--------------
 po/hu.po    | 27 +++++++++++++--------------
 po/nb.po    | 27 +++++++++++++--------------
 po/ru.po    | 25 ++++++++++++-------------
 po/sr.po    | 30 ++++++++++++++----------------
 po/sv.po    | 27 +++++++++++++--------------
 src/exch.c  |  2 +-
 src/game.c  |  2 +-
 src/help.c  |  9 ++++-----
 19 files changed, 206 insertions(+), 217 deletions(-)

diff --git a/NEWS b/NEWS
index 9ad6ae7..1dcef6b 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,12 @@ at http://www.zap.org.au/services/svn/.
 Version 7.10 (not yet released)
 -------------------------------
 
+Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
+string starts or  ends with a new-line character,  its translation must do
+so as well.  This has an impact on labels in particular.  Also changed the
+help text string  "Page N of M"  to allow  translations of the form  "Of M
+pages, this is page N".  All translations have been updated as a result.
+
 Added a data directory that will contain a desktop file and appropriate
 icons.
 
diff --git a/po/da.po b/po/da.po
index 6e64f73..ff42540 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:24+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:13+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -441,10 +441,10 @@ msgstr "Ingen firmaer på kortet"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1337,7 +1337,7 @@ msgstr ""
 "også låne fra Den Interstellare Handelsbank for at finansiere yderligere køb\n"
 "på aktiebørsen.\n"
 "\n"
-"Galaksens kort er repræsenteret  ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan\n"
+"Galaksens kort er repræsenteret  ved et ^B~x^N × ^B~y^N-gitter. Et typisk afsnit kan\n"
 "se således ud:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1544,19 +1544,18 @@ msgstr "@ Hjælpetekst, side 10\n"
 msgid "  How to Play  "
 msgstr "  Sådan spiller du  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Side %d af %d"
+msgid "Page %1$d of %2$d"
+msgstr "Side %1$d af %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Tryk <MELLEMRUM> for at fortsætte ] "
@@ -1569,7 +1568,7 @@ msgstr "[ Tryk <MELLEMRUM> for at fortsætte ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Tryk <MELLEMRUM> for at fortsætte eller <←> for den forrige side ] "
diff --git a/po/de.po b/po/de.po
index bd4a124..512fb8d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:14+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -449,10 +449,10 @@ msgstr "Keine Firmen auf der Karte"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1341,7 +1341,7 @@ msgstr ""
 "der  Interstellaren  Handelsbank  leihen,  um  weitere Akteinkäufe zu finan-\n"
 "zieren.\n"
 "\n"
-"Die Karte der Galaxie  wird dargetellt durch ein  ^B~x^N x ^B~y^N  Raster. Ein typi-\n"
+"Die Karte der Galaxie  wird dargetellt durch ein  ^B~x^N × ^B~y^N  Raster. Ein typi-\n"
 "scher Teil von ihr könnte so aussehen:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1546,19 +1546,18 @@ msgstr "@ Hilfe, Seite 10\n"
 msgid "  How to Play  "
 msgstr "  Spielanleitung  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
+msgid "Page %1$d of %2$d"
+msgstr "Seite %1$d von %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ <LEERTASTE> drücken um fortzufahren ] "
@@ -1570,7 +1569,7 @@ msgstr "[ <LEERTASTE> drücken um fortzufahren ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ <LEERTASTE> für nächste, <RÜCKSCHRITT> für vorherige Seite ] "
diff --git a/po/en_AU.po b/po/en_AU.po
index 5b211f3..05ed2cb 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:14+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
@@ -436,10 +436,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1327,7 +1327,7 @@ msgstr ""
 "also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
 "finance additional purchases on the Stock Exchange.\n"
 "\n"
-"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"The map of the galaxy  is represented  by a ^B~x^N × ^B~y^N grid.  A typical section\n"
 "of it may be:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1531,19 +1531,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1555,7 +1554,7 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
diff --git a/po/en_CA.po b/po/en_CA.po
index 567251f..5bf9b64 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:15+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
@@ -436,10 +436,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1327,7 +1327,7 @@ msgstr ""
 "also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
 "finance additional purchases on the Stock Exchange.\n"
 "\n"
-"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"The map of the galaxy  is represented  by a ^B~x^N × ^B~y^N grid.  A typical section\n"
 "of it may be:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1531,19 +1531,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1555,7 +1554,7 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
diff --git a/po/en_GB.po b/po/en_GB.po
index 90b7cf7..ca19f57 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:15+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
@@ -436,10 +436,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1327,7 +1327,7 @@ msgstr ""
 "also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
 "finance additional purchases on the Stock Exchange.\n"
 "\n"
-"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"The map of the galaxy  is represented  by a ^B~x^N × ^B~y^N grid.  A typical section\n"
 "of it may be:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1531,19 +1531,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1555,7 +1554,7 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
diff --git a/po/en_US.po b/po/en_US.po
index ba83a27..d9f73db 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:16+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -436,10 +436,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1327,7 +1327,7 @@ msgstr ""
 "also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
 "finance additional purchases on the Stock Exchange.\n"
 "\n"
-"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"The map of the galaxy  is represented  by a ^B~x^N × ^B~y^N grid.  A typical section\n"
 "of it may be:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1531,19 +1531,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1555,7 +1554,7 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
diff --git a/po/eo.po b/po/eo.po
index 5977104..6f3b6ef 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:17+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -442,10 +442,10 @@ msgstr "Neniu kompanio sur la mapo"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Kompanio"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1333,7 +1333,7 @@ msgstr ""
 "ankaŭ ŝanĝas.  Ludantoj povas  ankaŭ pruntepreni  el la Interstelara Komerca\n"
 "Banko por financi aldonajn aĉetojn en la akci-interŝanĝejo.\n"
 "\n"
-"La galaksi-mapo estas reprezentata  per krado  ^B~x^N x ^B~y^N.  Ordinara areo de ĝi\n"
+"La galaksi-mapo estas reprezentata  per krado  ^B~x^N × ^B~y^N.  Ordinara areo de ĝi\n"
 "povas esti:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1537,19 +1537,18 @@ msgstr "@\n"
 msgid "  How to Play  "
 msgstr "  Kiel ludi  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Paĝo %d el %d"
+msgid "Page %1$d of %2$d"
+msgstr "Paĝo %1$d el %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Premu <SPACOn> por daŭrigi ] "
@@ -1561,7 +1560,7 @@ msgstr "[ Premu <SPACOn> por daŭrigi ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Premu <SPACOn> por daŭrigi aŭ <RETROPAŜOn> por la antaŭa paĝo ] "
diff --git a/po/fi.po b/po/fi.po
index 4a2dedb..e41f305 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:29+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -446,10 +446,10 @@ msgstr "Kartalla ei ole yrityksiä"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Yritys"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1541,19 +1541,18 @@ msgstr "@ Opasteteksti, sivu 10\n"
 msgid "  How to Play  "
 msgstr "  Kuinka pelata  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Sivu %d / %d"
+msgid "Page %1$d of %2$d"
+msgstr "Sivu  %1$d / %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Paina <VÄLIYÖNTIÄ> jatkaaksesi ] "
@@ -1565,7 +1564,7 @@ msgstr "[ Paina <VÄLIYÖNTIÄ> jatkaaksesi ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Paina <VÄLILYÖNTIÄ> jatkaaksesi tai <←> siirtyäksesi edelliselle sivulle ] "
diff --git a/po/fr.po b/po/fr.po
index 80c0489..7237435 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:18+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -449,10 +449,10 @@ msgstr "Aucune compagnie sur la carte"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Compagnies"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1341,7 +1341,7 @@ msgstr ""
 "peuvent aussi emprunter à la Banque Interstellaire du Commerce pour financer\n"
 "des achats supplémentaires à la bourse.\n"
 "\n"
-"La  carte  de la galaxie  est  représentée par  une grille  de ^B~x^N x ^B~y^N.  Une\n"
+"La  carte  de la galaxie  est  représentée par  une grille  de ^B~x^N × ^B~y^N.  Une\n"
 "section typique pourrait être:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1556,19 +1556,18 @@ msgstr "@ Texte d'aide, page 10\n"
 msgid "  How to Play  "
 msgstr "  Comment jouer  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d sur %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d sur %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Appuyez <ESPACE> pour continuer ] "
@@ -1580,7 +1579,7 @@ msgstr "[ Appuyez <ESPACE> pour continuer ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente ] "
diff --git a/po/hr.po b/po/hr.po
index ef507d2..b034128 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:19+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -441,10 +441,10 @@ msgstr "Nema tvrtki na mapi"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Tvrtka"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1337,7 +1337,7 @@ msgstr ""
 "postocima).  Igrači također mogu posuđivati novce od Međuzvjezdane trgovačke\n"
 "banke za financiranje kupovanja dodatnih dionica na Burzi.\n"
 "\n"
-"Karta  galaksije  prikazana  je mrežom  ^B~x^N x ^B~y^N.  Uobičajeni  prikaz  dijela\n"
+"Karta  galaksije  prikazana  je mrežom  ^B~x^N × ^B~y^N.  Uobičajeni  prikaz  dijela\n"
 "galaksije može biti:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1541,19 +1541,18 @@ msgstr "@ Tekst pomoći, stranica 10\n"
 msgid "  How to Play  "
 msgstr "  Upute za igranje  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Stranica %d od %d"
+msgid "Page %1$d of %2$d"
+msgstr "Stranica %1$d od %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ] "
@@ -1565,7 +1564,7 @@ msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ili <BACKSPACE> za povratak ] "
diff --git a/po/hu.po b/po/hu.po
index 8d3ec08..0615dd1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:19+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -438,10 +438,10 @@ msgstr "Nincsenek társaságok a térképen"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Társaság"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1331,7 +1331,7 @@ msgstr ""
 "Banktól  is  kérhetnek  kölcsön  az  Értéktőzsdén  való  további  vásárlások\n"
 "finanszírozásához.\n"
 "\n"
-"A galaxis térképét egy ^B~x^N x ^B~y^N méretű rács ábrázolja.  Egy tipikus szelvénye\n"
+"A galaxis térképét egy ^B~x^N × ^B~y^N méretű rács ábrázolja.  Egy tipikus szelvénye\n"
 "az alábbi lehet:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1535,19 +1535,18 @@ msgstr "@ Súgószöveg, 10. oldal\n"
 msgid "  How to Play  "
 msgstr "  A játék menete  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "%d / %d oldal"
+msgid "Page %1$d of %2$d"
+msgstr "%1$d / %2$d oldal"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz ] "
@@ -1559,7 +1558,7 @@ msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz vagy <BACKSPACE>-t az előző oldalhoz] "
diff --git a/po/nb.po b/po/nb.po
index a7840d6..95cbd7d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:20+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -441,10 +441,10 @@ msgstr "Ingen bedrifter på kartet"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1331,7 +1331,7 @@ msgstr ""
 "avkastningen på hver del (i prosent) endres også. Spillere kan også låne fra\n"
 "Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n"
 "\n"
-"Kartet  over galaksen  er representert  ved en  ^B~x^N x ^B~y^N  rutenett. En typisk\n"
+"Kartet  over galaksen  er representert  ved en  ^B~x^N × ^B~y^N  rutenett. En typisk\n"
 "seksjon kan være:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1536,19 +1536,18 @@ msgstr "@ Hjelpetekst, side 10\n"
 msgid "  How to Play  "
 msgstr "  Slik spiller man  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Side  %d av %d"
+msgid "Page %1$d of %2$d"
+msgstr "Side  %1$d av %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Trykk <MELLOMROM> for å fortsette ] "
@@ -1560,7 +1559,7 @@ msgstr "[ Trykk <MELLOMROM> for å fortsette ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Trykk <MELLOMROM> for å fortsette eller <BACKSPACE> for forrige side ] "
diff --git a/po/ru.po b/po/ru.po
index 9db666a..c1159e5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:25+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:21+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -448,10 +448,10 @@ msgstr "Нет акционерных обществ на карте"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Фирма"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1547,19 +1547,18 @@ msgstr "@\n"
 msgid "  How to Play  "
 msgstr "  Как играть в «Звёздные торговцы»  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Страница №%d из %d"
+msgid "Page %1$d of %2$d"
+msgstr "Страница №%1$d из %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] "
@@ -1571,7 +1570,7 @@ msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> — вернуться на пред. страницу ] "
diff --git a/po/sr.po b/po/sr.po
index 6fa8fda..d8fa84a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 10:52+1100\n"
-"PO-Revision-Date: 2016-03-26 15:58+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:21+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -438,10 +438,10 @@ msgstr "Нема предузећа на карти"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Предузеће"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1124,8 +1124,7 @@ msgstr[2] ""
 msgid "%s: missing field on line %d"
 msgstr "%s: недостаје поље у %d. реду"
 
-#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
-#: src/fileio.c:393
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393
 #, c-format
 msgid "%s: illegal field on line %d"
 msgstr "%s: недозвољено поље у %d. реду"
@@ -1335,7 +1334,7 @@ msgstr ""
 "такође мења.  Играчи  такође могу позајмити новац  од Међузвездане Трговачке\n"
 "Банке да би финансирали додатне куповине на берзи.\n"
 "\n"
-"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени приказ\n"
+"Карта галаксије је представљена мрежом величине  ^B~x^N × ^B~y^N.  Уобичајени приказ\n"
 "одељка галаксије може бити:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1539,19 +1538,18 @@ msgstr "@ Текст помоћи, 10. страница\n"
 msgid "  How to Play  "
 msgstr "  Како да играте  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "%d. страница од %d"
+msgid "Page %1$d of %2$d"
+msgstr "%1$d. страница од %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Притисните <РАЗМАК> да наставите ] "
@@ -1563,7 +1561,7 @@ msgstr "[ Притисните <РАЗМАК> да наставите ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Притисните <РАЗМАК> да наставите или <ПОВРАТНИЦУ> за претходну страницу ] "
diff --git a/po/sv.po b/po/sv.po
index f1ea041..0c95171 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 09:38+1100\n"
-"PO-Revision-Date: 2016-03-11 09:26+1100\n"
+"POT-Creation-Date: 2016-04-16 07:05+1000\n"
+"PO-Revision-Date: 2016-04-16 07:22+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -441,10 +441,10 @@ msgstr "Inga företag på kartan"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Företag"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1336,7 +1336,7 @@ msgstr ""
 "låna från  den  interstellära handelsbanken  för att finansiera  ytterligare\n"
 "inköp på aktiemarknaden.\n"
 "\n"
-"Kartan över galaxen  representeras av ett rutnät  med storleken ^B~x^N x ^B~y^N.  En\n"
+"Kartan över galaxen  representeras av ett rutnät  med storleken ^B~x^N × ^B~y^N.  En\n"
 "typisk del av den kan vara:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1539,20 +1539,19 @@ msgstr "@ Hjälptext, sida 10\n"
 msgid "  How to Play  "
 msgstr "  Hur man spelar  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Sida %d av %d"
+msgid "Page %1$d of %2$d"
+msgstr "Sida %1$d av %2$d"
 
 # Väljer RETUR för att motverka platsbrist
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Tryck <RETUR> för att fortsätta ] "
@@ -1565,7 +1564,7 @@ msgstr "[ Tryck <RETUR> för att fortsätta ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Tryck <RETUR> för att fortsätta eller <BACKSTEG> för föregående sida ] "
diff --git a/src/exch.c b/src/exch.c
index 0bce074..7060d41 100644
--- a/src/exch.c
+++ b/src/exch.c
@@ -117,7 +117,7 @@ void exchange_stock (void)
 	    left(curwin, 4, 4, attr_subtitle, 0, 0, 2,
 		 /* TRANSLATORS: "Company" is a two-line column label in
 		    a table containing a list of companies. */
-		 pgettext("subtitle", "\nCompany"));
+		 pgettext("subtitle", " \nCompany"));
 	    right(curwin, 4, w - 4, attr_subtitle, 0, 0, 2,
 		  /* TRANSLATORS: "Shares left" is a two-line column
 		     label in a table containing the number of shares
diff --git a/src/game.c b/src/game.c
index 3734311..001eb23 100644
--- a/src/game.c
+++ b/src/game.c
@@ -722,7 +722,7 @@ void show_status (int num)
 	    left(curwin, 4, 4, attr_subtitle, 0, 0, 2,
 		 /* TRANSLATORS: "Company" is a two-line column label in
 		    a table containing a list of companies. */
-		 pgettext("subtitle", "\nCompany"));
+		 pgettext("subtitle", " \nCompany"));
 	    right(curwin, 4, w - 4, attr_subtitle, 0, 0, 2,
 		  /* TRANSLATORS: "Ownership" is a two-line column label
 		     in a table containing the current player's
diff --git a/src/help.c b/src/help.c
index ea62997..3f5aa89 100644
--- a/src/help.c
+++ b/src/help.c
@@ -279,11 +279,10 @@ void show_help (void)
 
 	center(curwin, 1, 0, attr_title, 0, 0, 1, _("  How to Play  "));
 	center(curwin, 2, 0, attr_normal, attr_highlight, 0, 1,
-	       /* TRANSLATORS: The first %d is the current page number,
-		  the second is the number of pages your help text takes
-		  (6, in English).  You can replace the second %d with a
-		  fixed word, if you like. */
-	       _("Page %d of %d"), curpage + 1, numpages);
+	       /* TRANSLATORS: The parameter %1$d is the current page
+		  number, %2$d is the number of pages your help text
+		  takes (6, in English). */
+	       _("Page %1$d of %2$d"), curpage + 1, numpages);
 	wmove(curwin, 4, 2);
 
 	// Process the help text string

From b61b532b657e42368ca3830cdf314627439a4296 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 11:40:54 +1000
Subject: [PATCH 13/99] Add a desktop file that can be locale-enabled

---
 NEWS            |  5 ++---
 data/desktop.in | 10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 data/desktop.in

diff --git a/NEWS b/NEWS
index 1dcef6b..32a7093 100644
--- a/NEWS
+++ b/NEWS
@@ -18,15 +18,14 @@ at http://www.zap.org.au/services/svn/.
 Version 7.10 (not yet released)
 -------------------------------
 
+Added a data directory that contains a desktop file and appropriate icons.
+
 Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
 string starts or  ends with a new-line character,  its translation must do
 so as well.  This has an impact on labels in particular.  Also changed the
 help text string  "Page N of M"  to allow  translations of the form  "Of M
 pages, this is page N".  All translations have been updated as a result.
 
-Added a data directory that will contain a desktop file and appropriate
-icons.
-
 Added the Serbian translation, with thanks to Мирослав Николић.
 
 
diff --git a/data/desktop.in b/data/desktop.in
new file mode 100644
index 0000000..fde8db5
--- /dev/null
+++ b/data/desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Star Traders
+_Comment=Play Star Traders, a simple game of interstellar trading
+_Keywords=game;interstellar;trading;strategy;
+Icon=trader
+Exec=trader
+TryExec=trader
+Type=Application
+Terminal=true
+Categories=Game;StrategyGame;

From d2223e8ac87bfe9335815db85526f50cc7543cb8 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:08:19 +1000
Subject: [PATCH 14/99] Rename desktop.in to trader.desktop.in

---
 data/{desktop.in => trader.desktop.in} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/{desktop.in => trader.desktop.in} (100%)

diff --git a/data/desktop.in b/data/trader.desktop.in
similarity index 100%
rename from data/desktop.in
rename to data/trader.desktop.in

From fab605260bdb4b1a3b49869d5603d43ecb252ce5 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:17:14 +1000
Subject: [PATCH 15/99] Ignore the data/trader.desktop output file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6b61a32..ce778a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ TAGS
 /build-aux/snippet/unused-parameter.h
 /build-aux/snippet/warn-on-use.h
 
+/data/trader.desktop
+
 /po/POTFILES
 /po/en@quot.insert-header
 /po/en@quot.po

From 9cd8c0f7a8ed9a4951b0eec46dfbf114ff39b6d7 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:19:22 +1000
Subject: [PATCH 16/99] Modern versions of msgfmt(1) require desktop file keys
 without "_"

---
 data/trader.desktop.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/trader.desktop.in b/data/trader.desktop.in
index fde8db5..ed27f22 100644
--- a/data/trader.desktop.in
+++ b/data/trader.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Star Traders
-_Comment=Play Star Traders, a simple game of interstellar trading
-_Keywords=game;interstellar;trading;strategy;
+Name=Star Traders
+Comment=Play Star Traders, a simple game of interstellar trading
+Keywords=game;interstellar;trading;strategy;
 Icon=trader
 Exec=trader
 TryExec=trader

From ca9558e6d3ce040b83f47961ba8013f8d9787e54 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:26:00 +1000
Subject: [PATCH 17/99] Add the data/trader.desktop.in file to be
 internationalised

---
 po/POTFILES.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cd95734..2baf4ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,6 +37,8 @@ src/help.c
 src/intf.c
 src/utils.c
 
+# Data files from Star Traders
+data/trader.desktop.in
 
 # Source files from the Gnulib GNU Portability Library
 lib/getopt.c

From e8cf79709cd802da1b1ef34861a530bd87573830 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:34:36 +1000
Subject: [PATCH 18/99] Reorder the list of files in POTFILES.in

This is to make the desktop file entries appear first in PO files.
---
 po/POTFILES.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2baf4ae..bf69c09 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,6 +26,9 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
+# Data files from Star Traders
+data/trader.desktop.in
+
 # Source files from Star Traders
 src/trader.c
 src/globals.c
@@ -37,8 +40,5 @@ src/help.c
 src/intf.c
 src/utils.c
 
-# Data files from Star Traders
-data/trader.desktop.in
-
 # Source files from the Gnulib GNU Portability Library
 lib/getopt.c

From cedd3188a88ead0c921b3744017cc52ef8e0065f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 16 Apr 2016 12:55:30 +1000
Subject: [PATCH 19/99] Add the new strings now found in data/trader.desktop.in

---
 po/da.po    | 26 +++++++++++++++++++-------
 po/de.po    | 26 +++++++++++++++++++-------
 po/en_AU.po | 26 +++++++++++++++++++-------
 po/en_CA.po | 26 +++++++++++++++++++-------
 po/en_GB.po | 26 +++++++++++++++++++-------
 po/en_US.po | 26 +++++++++++++++++++-------
 po/eo.po    | 26 +++++++++++++++++++-------
 po/fi.po    | 26 +++++++++++++++++++-------
 po/fr.po    | 26 +++++++++++++++++++-------
 po/hr.po    | 26 +++++++++++++++++++-------
 po/hu.po    | 26 +++++++++++++++++++-------
 po/nb.po    | 26 +++++++++++++++++++-------
 po/ru.po    | 26 +++++++++++++++++++-------
 po/sr.po    | 26 +++++++++++++++++++-------
 po/sv.po    | 26 +++++++++++++++++++-------
 15 files changed, 285 insertions(+), 105 deletions(-)

diff --git a/po/da.po b/po/da.po
index ff42540..7ef8d30 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:13+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:44+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spil Star Traders, et simpelt spil med rumhandel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1588,11 +1605,6 @@ msgstr "%s: tegn har ugyldig bredde: »%lc«"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminalstørrelse er for lille (%d x %d krævet)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/de.po b/po/de.po
index 512fb8d..1515671 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:14+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:44+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1589,11 +1606,6 @@ msgstr "%s: Das Zeichen hat eine unzulässige Breite: „%lc“"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "Das Terminal ist zu klein (Mindestgröße ist %d x %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/en_AU.po b/po/en_AU.po
index 05ed2cb..4e0bb94 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:14+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:45+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1574,11 +1591,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/en_CA.po b/po/en_CA.po
index 5bf9b64..caa166a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:15+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:45+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1574,11 +1591,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/en_GB.po b/po/en_GB.po
index ca19f57..703064d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:15+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:46+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1574,11 +1591,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/en_US.po b/po/en_US.po
index d9f73db..4bbee45 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:16+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:46+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1574,11 +1591,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/eo.po b/po/eo.po
index 6f3b6ef..3998480 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:17+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:47+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -25,6 +25,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1580,11 +1597,6 @@ msgstr "%s: signo havas malpermesatan larĝon: '%lc'"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal-grando tro malgrandas (necesas %d x %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/fi.po b/po/fi.po
index e41f305..2e0a481 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:29+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:48+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -25,6 +25,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Tähtikauppiaat"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1584,11 +1601,6 @@ msgstr "%s: merkillä on väärä leveys: ”%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "pääteikkunakoko on liian pieni (%d x %d vaadittu)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Tähtikauppiaat"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/fr.po b/po/fr.po
index 7237435..e601240 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:18+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:49+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -31,6 +31,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1599,11 +1616,6 @@ msgstr "%s: caractère avec une largeur illégale: « %lc »"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "la taille du terminal est trop petite (%d x %d requis)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/hr.po b/po/hr.po
index b034128..f37aaf0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:19+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:49+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1584,11 +1601,6 @@ msgstr "%s: znak ima nedozvoljenu širinu: „%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "veličina terminala je premalena (potrebno je %d x %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/hu.po b/po/hu.po
index 0615dd1..a4a7940 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:19+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:49+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1578,11 +1595,6 @@ msgstr "%s: a karakternek szabálytalan szélessége van: „%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "a terminál mérete túl kicsi (%d x %d szükséges)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/nb.po b/po/nb.po
index 95cbd7d..b47609d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:20+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:50+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spill Star Traders, et enkelt spill med interstellar handel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1579,11 +1596,6 @@ msgstr "%s: tegn har ugyldig bredde: «%lc»"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal størrelsen er for liten (%d x %d kreves)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/ru.po b/po/ru.po
index c1159e5..31ba6a2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:21+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:52+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -27,6 +27,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Звёздные торговцы"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Играть в «Звёздные торговцы», простую игру о межзвёздной торговле"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "игра;межзвёздная;торговля;стратегия;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1590,11 +1607,6 @@ msgstr "%s: символ имеет неверную ширину: «%lc»"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "размеры терминала слишком малы (нужны %d на %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Звёздные торговцы"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/sr.po b/po/sr.po
index d8fa84a..1268f6c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:21+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:52+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -25,6 +25,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Звездани трговци"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Играјте Звездане трговце, једноставну игру међузвезданог трговања"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1581,11 +1598,6 @@ msgstr "%s: знак је недозвољене ширине: „%lc“"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "величина терминала је премала (потребна је %d x %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Звездани трговци"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
diff --git a/po/sv.po b/po/sv.po
index 0c95171..5be05fb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 07:05+1000\n"
-"PO-Revision-Date: 2016-04-16 07:22+1000\n"
+"POT-Creation-Date: 2016-04-16 12:31+1000\n"
+"PO-Revision-Date: 2016-04-16 12:52+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -24,6 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spela Star Traders, ett enkelt spel om interstellär handel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: `%s'\n"
@@ -1584,11 +1601,6 @@ msgstr "%s: tecken har ogiltig bredd: ”%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminalstorlek är för liten (%d x %d krävs)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"

From 65129e3cc32e9ed547da5f7d77b018d7fc77a6ac Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 12 Dec 2016 21:19:32 +1100
Subject: [PATCH 20/99] Update the list of files to ignore

---
 .gitignore     |   2 +-
 lib/.gitignore | 210 +++++++++++++++++++++++++------------------------
 m4/.gitignore  | 174 ++++++++++++++++++++--------------------
 3 files changed, 194 insertions(+), 192 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce778a1..b18d09d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 *.o
 *.a
 *.gmo
-.deps/
 Makefile
 Makefile.in
 TAGS
+.deps/
 
 /aclocal.m4
 /autom4te.cache
diff --git a/lib/.gitignore b/lib/.gitignore
index 1970414..1ec947c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,107 +1,109 @@
 Makefile.am
-btowc.c
-c-ctype.c
-c-ctype.h
-c-strcase.h
-c-strcasecmp.c
-c-strncasecmp.c
-config.charset
-crc.c
-crc.h
-getopt.c
-getopt.in.h
-getopt1.c
-getopt_int.h
-gettext.h
-gettimeofday.c
-hard-locale.c
-hard-locale.h
-iconv.c
-iconv.in.h
-iconv_close.c
-iconv_open-aix.gperf
-iconv_open-hpux.gperf
-iconv_open-irix.gperf
-iconv_open-osf.gperf
-iconv_open-solaris.gperf
-iconv_open.c
-localcharset.c
-localcharset.h
-locale.in.h
-mbrtowc.c
-mbsinit.c
-mbsrtowcs-impl.h
-mbsrtowcs-state.c
-mbsrtowcs.c
-mbtowc-impl.h
-mbtowc.c
-memchr.c
-memchr.valgrind
-ref-add.sin
-ref-del.sin
-stdbool.in.h
-stddef.h
-stddef.in.h
-stdint.in.h
-stdio.in.h
-stdlib.in.h
-str-two-way.h
-streq.h
-striconv.c
-striconv.h
-string.in.h
-strnlen1.c
-strnlen1.h
-strstr.c
-sys_stat.in.h
-sys_time.in.h
-sys_types.in.h
-time.in.h
-unistd.c
-unistd.in.h
-unistr.in.h
-unitypes.in.h
-verify.h
-wchar.in.h
-wcrtomb.c
-wcsdup-impl.h
-wcsdup.c
-wctob.c
-wctomb-impl.h
-wctomb.c
-wctype-h.c
-wctype.in.h
-wmemcpy-impl.h
-wmemcpy.c
 
-arg-nonnull.h
-c++defs.h
-charset.alias
-configmake.h
-getopt.h
-iconv.h
-iconv_open-aix.h
-iconv_open-hpux.h
-iconv_open-irix.h
-iconv_open-osf.h
-iconv_open-solaris.h
-locale.h
-ref-add.sed
-ref-del.sed
-stdio.h
-stdlib.h
-string.h
-sys/
-time.h
-unistd.h
-unistr.h
-unitypes.h
-unused-parameter.h
-warn-on-use.h
-wchar.h
-wctype.h
+/btowc.c
+/c-ctype.c
+/c-ctype.h
+/c-strcase.h
+/c-strcasecmp.c
+/c-strncasecmp.c
+/config.charset
+/crc.c
+/crc.h
+/getopt.c
+/getopt.in.h
+/getopt1.c
+/getopt_int.h
+/gettext.h
+/gettimeofday.c
+/hard-locale.c
+/hard-locale.h
+/iconv.c
+/iconv.in.h
+/iconv_close.c
+/iconv_open-aix.gperf
+/iconv_open-hpux.gperf
+/iconv_open-irix.gperf
+/iconv_open-osf.gperf
+/iconv_open-solaris.gperf
+/iconv_open.c
+/localcharset.c
+/localcharset.h
+/locale.in.h
+/mbrtowc.c
+/mbsinit.c
+/mbsrtowcs-impl.h
+/mbsrtowcs-state.c
+/mbsrtowcs.c
+/mbtowc-impl.h
+/mbtowc.c
+/memchr.c
+/memchr.valgrind
+/ref-add.sin
+/ref-del.sin
+/stdbool.in.h
+/stddef.in.h
+/stdint.in.h
+/stdio.in.h
+/stdlib.in.h
+/str-two-way.h
+/streq.h
+/striconv.c
+/striconv.h
+/string.in.h
+/strnlen1.c
+/strnlen1.h
+/strstr.c
+/sys_stat.in.h
+/sys_time.in.h
+/sys_types.in.h
+/time.in.h
+/unistd.c
+/unistd.in.h
+/unistr.in.h
+/unitypes.in.h
+/verify.h
+/wchar.in.h
+/wcrtomb.c
+/wcsdup-impl.h
+/wcsdup.c
+/wctob.c
+/wctomb-impl.h
+/wctomb.c
+/wctype-h.c
+/wctype.in.h
+/wmemcpy-impl.h
+/wmemcpy.c
 
-unistr/.dirstamp
-unistr/u8-mbtoucr.c
-unistr/u8-uctomb-aux.c
-unistr/u8-uctomb.c
+/arg-nonnull.h
+/c++defs.h
+/charset.alias
+/configmake.h
+/getopt.h
+/iconv.h
+/iconv_open-aix.h
+/iconv_open-hpux.h
+/iconv_open-irix.h
+/iconv_open-osf.h
+/iconv_open-solaris.h
+/locale.h
+/ref-add.sed
+/ref-del.sed
+/stddef.h
+/stdio.h
+/stdlib.h
+/string.h
+/time.h
+/unistd.h
+/unistr.h
+/unitypes.h
+/unused-parameter.h
+/warn-on-use.h
+/wchar.h
+/wctype.h
+
+/sys/
+
+/unistr/.dirstamp
+/unistr/u8-mbtoucr.c
+/unistr/u8-uctomb-aux.c
+/unistr/u8-uctomb.c
diff --git a/m4/.gitignore b/m4/.gitignore
index fa95958..99b0141 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,87 +1,87 @@
-00gnulib.m4
-absolute-header.m4
-assert.m4
-btowc.m4
-codeset.m4
-config-h.m4
-configmake.m4
-extensions.m4
-extern-inline.m4
-fcntl-o.m4
-getopt.m4
-gettext.m4
-gettimeofday.m4
-glibc2.m4
-glibc21.m4
-gnulib-common.m4
-gnulib-comp.m4
-gnulib-tool.m4
-hard-locale.m4
-iconv.m4
-iconv_h.m4
-iconv_open.m4
-include_next.m4
-inline.m4
-intdiv0.m4
-intl.m4
-intldir.m4
-intlmacosx.m4
-intmax.m4
-inttypes-pri.m4
-inttypes_h.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libunistring-base.m4
-localcharset.m4
-locale-fr.m4
-locale-ja.m4
-locale-zh.m4
-locale_h.m4
-lock.m4
-longlong.m4
-mbrtowc.m4
-mbsinit.m4
-mbsrtowcs.m4
-mbstate_t.m4
-mbtowc.m4
-memchr.m4
-mmap-anon.m4
-multiarch.m4
-nls.m4
-nocrash.m4
-off_t.m4
-po.m4
-printf-posix.m4
-progtest.m4
-size_max.m4
-ssize_t.m4
-stdbool.m4
-stddef_h.m4
-stdint.m4
-stdint_h.m4
-stdio_h.m4
-stdlib_h.m4
-string_h.m4
-strstr.m4
-sys_socket_h.m4
-sys_stat_h.m4
-sys_time_h.m4
-sys_types_h.m4
-threadlib.m4
-time_h.m4
-uintmax_t.m4
-unistd_h.m4
-visibility.m4
-warn-on-use.m4
-wchar_h.m4
-wchar_t.m4
-wcrtomb.m4
-wcsdup.m4
-wctob.m4
-wctomb.m4
-wctype_h.m4
-wint_t.m4
-wmemcpy.m4
-xsize.m4
+/00gnulib.m4
+/absolute-header.m4
+/assert.m4
+/btowc.m4
+/codeset.m4
+/config-h.m4
+/configmake.m4
+/extensions.m4
+/extern-inline.m4
+/fcntl-o.m4
+/getopt.m4
+/gettext.m4
+/gettimeofday.m4
+/glibc2.m4
+/glibc21.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/hard-locale.m4
+/iconv.m4
+/iconv_h.m4
+/iconv_open.m4
+/include_next.m4
+/inline.m4
+/intdiv0.m4
+/intl.m4
+/intldir.m4
+/intlmacosx.m4
+/intmax.m4
+/inttypes-pri.m4
+/inttypes_h.m4
+/lcmessage.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/libunistring-base.m4
+/localcharset.m4
+/locale-fr.m4
+/locale-ja.m4
+/locale-zh.m4
+/locale_h.m4
+/lock.m4
+/longlong.m4
+/mbrtowc.m4
+/mbsinit.m4
+/mbsrtowcs.m4
+/mbstate_t.m4
+/mbtowc.m4
+/memchr.m4
+/mmap-anon.m4
+/multiarch.m4
+/nls.m4
+/nocrash.m4
+/off_t.m4
+/po.m4
+/printf-posix.m4
+/progtest.m4
+/size_max.m4
+/ssize_t.m4
+/stdbool.m4
+/stddef_h.m4
+/stdint.m4
+/stdint_h.m4
+/stdio_h.m4
+/stdlib_h.m4
+/string_h.m4
+/strstr.m4
+/sys_socket_h.m4
+/sys_stat_h.m4
+/sys_time_h.m4
+/sys_types_h.m4
+/threadlib.m4
+/time_h.m4
+/uintmax_t.m4
+/unistd_h.m4
+/visibility.m4
+/warn-on-use.m4
+/wchar_h.m4
+/wchar_t.m4
+/wcrtomb.m4
+/wcsdup.m4
+/wctob.m4
+/wctomb.m4
+/wctype_h.m4
+/wint_t.m4
+/wmemcpy.m4
+/xsize.m4

From ce0018c0cebc9245404de725002e29daf858607d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 12 Dec 2016 21:31:30 +1100
Subject: [PATCH 21/99] Update documentation for migration to Git

---
 INSTALL | 21 ++++++++++-----------
 NEWS    |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/INSTALL b/INSTALL
index 398bc5c..f13a9e9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -155,19 +155,18 @@ to  remove the  Makefiles that  know the  path to  which those  files were
 installed!
 
 
-Subversion Repository
-=====================
+Git Repository
+==============
 
-You can always  download the latest version of  Star Traders directly from
-the Subversion repository on the ZAP Group server:
+You can always  download the latest version of Star Traders  directly from
+the Git repository on the ZAP Group server:
 
-    svn co http://svn.zap.org.au/svn/trader/unix/trunk/ trader
+    git clone git://git.zap.org.au/data/git/trader.git
 
 Released versions of Star Traders include all scripts and files needed for
-installation.  If you are checking out the source code from the Subversion
-repository, however,  you will need  to update these files  yourself.  You
-will need  the following additional tools  installed on your  system to do
-so:
+installation.  If you are cloning the source code from the Git repository,
+however,  you will need to update these files yourself.  You will need the
+following additional tools installed on your system to do so:
 
 1.  Autoconf (http://www.gnu.org/software/autoconf/)
 2.  Automake (http://www.gnu.org/software/automake/)
@@ -193,8 +192,8 @@ For Translators
 
 Thank you for even considering to translate  Star Traders into your native
 language!  You may use  either  a released version of  Star Traders, or an
-unreleased one, as discussed  in the Subversion Repository  section above.
-In either case, you may find the following workflow useful.
+unreleased one,  as discussed  in the  Git Repository  section  above.  In
+either case, you may find the following workflow useful.
 
 First, run "./build-aux/bootstrap" if needed (only for unreleased versions
 of Star Traders).
diff --git a/NEWS b/NEWS
index 32a7093..3c5b05b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,9 @@ is to  create companies, buy and  sell shares, borrow and  repay money, in
 order to become the wealthiest player (the winner).
 
 The following history is presented in reverse chronological order.  If you
-would like to  see a list of detailed changes to  this project, you should
-consult the Subversion repository for "trader" on The ZAP Group web server
-at http://www.zap.org.au/services/svn/.
+would like to see  a list of detailed changes to this project,  you should
+browse  the Git repository on  The ZAP Group  web server  at the following
+location: http://www.zap.org.au/gitweb/trader.git
 
 
 Version 7.10 (not yet released)

From 6ff2cd8b7d7c2e87b013ad264ca6dfcd28cf07e1 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 12 Dec 2016 21:43:42 +1100
Subject: [PATCH 22/99] Create a README file to describe the new
 po-translationproject branch

Previously, the po-translationproject branch was a true branch of master,
being merged into master on appropriate occasions.  However, the branch
was never updated to reflect master.

The new branch has been created as an orphan branch, completely empty
apart from this README file.  It will only contain versions of
translations as they appear on the Translation Project website, and will
be merged into master after every update.  No other (public) branch will
ever be merged into this branch.

The last commit on the old branch of the same name was
3553821a5c6a9591bbe3b4795e00f60789d059f0, dated 26th March 2016.
---
 po/README | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 po/README

diff --git a/po/README b/po/README
new file mode 100644
index 0000000..284d32f
--- /dev/null
+++ b/po/README
@@ -0,0 +1,18 @@
+**************************************************************************
+*                                                                        *
+*              Star Traders: A Game of Interstellar Trading              *
+*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                                                                        *
+**************************************************************************
+
+This directory,  po, contains translations  for text strings used  in Star
+Traders.  The GNU Gettext project is used for this purpose.
+
+
+**************************************************************************
+*                      Upstream Translation Project                      *
+**************************************************************************
+
+This version of the directory contains files received from the Translation
+Project (www.translationproject.org).   These are  merged into  the master
+branch as appropriate.

From a3b25c434143a75cb9500badc4fe8f3ae9a894fe Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 12 Dec 2016 22:01:21 +1100
Subject: [PATCH 23/99] Mirror the latest translations at the Translation
 Project

All translations of Star Traders are present as stored on the Translation
Project website at http://translationproject.org/latest/trader/

Original dates:

da.po    2015-09-30 18:02
de.po    2015-08-24 11:47
en_GB.po 2015-08-27 21:20
eo.po    2016-02-15 01:32
fi.po    2015-09-19 12:52
fr.po    2015-08-27 13:17
hr.po    2012-04-19 16:27
hu.po    2015-08-30 09:52
nb.po    2015-08-27 09:42
ru.po    2012-03-29 10:27
sr.po    2016-03-25 22:22
sv.po    2015-08-30 23:22
---
 po/da.po    | 1738 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/de.po    | 1739 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/en_GB.po | 1723 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/eo.po    | 1731 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fi.po    | 1733 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po    | 1740 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/hr.po    | 1725 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/hu.po    | 1729 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/nb.po    | 1730 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ru.po    | 1703 +++++++++++++++++++++++++++++++++++++++++++++++++
 po/sr.po    | 1731 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sv.po    | 1735 ++++++++++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 20757 insertions(+)
 create mode 100644 po/da.po
 create mode 100644 po/de.po
 create mode 100644 po/en_GB.po
 create mode 100644 po/eo.po
 create mode 100644 po/fi.po
 create mode 100644 po/fr.po
 create mode 100644 po/hr.po
 create mode 100644 po/hu.po
 create mode 100644 po/nb.po
 create mode 100644 po/ru.po
 create mode 100644 po/sr.po
 create mode 100644 po/sv.po

diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..a59240a
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,1738 @@
+# *************************************************************************
+# *                                                                       *
+# *                 Danish Translations for Star Traders                  *
+# *                 Copyright (C) 2012-15, John Zaitseff                  *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Joe Hansen <joedalton2@yahoo.dk>, 2012-15.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-09-30 09:51+1000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: ugyldig værdi for --max-turn: »%s«\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: ugyldig operand »%s«\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: ugyldigt spilnummer »%s«\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: ekstra operand »%s«\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Ophavsret %s, John Zaitseff.\n"
+"\n"
+"Star Traders er et simpelt spil med rumhandel, hvor formålet er at oprette\n"
+"firmaer, købe og sælge aktier, låne og betale tilbage på lån, alt sammen\n"
+"for at blive den rigeste spiller (vinderen).\n"
+"\n"
+"Dette program er frit programmel, som er distribueret under betingelserne\n"
+"i GNU General Public License, version 3 eller senere. Du er velkommen til\n"
+"at ændre og/eller distribuere programmet under bestemte betingelser. Dette\n"
+"program har INGEN GARANTI, indenfor lovens rammer; se licensen for yderligere\n"
+"detaljer.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Prøv »%s --help« for yderligere information.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Brug: %s [TILVALG ...] [SPIL]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Spil Star Traders, et simpelt spil med rumhandel.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Tilvalg:\n"
+"  -V, --version        vis versionsinformation og afslut\n"
+"  -h, --help           vis denne hjælpetekst og afslut\n"
+"      --no-color       brug ikke farve i tekstvisningen\n"
+"      --max-turn=ANT   sæt antallet af runder til ANT\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Hvis SPIL er angivet som et tal mellem 1 og 9, indlæs og fortsæt\n"
+"med at spille. Hvis SPIL ikke er angivet, så start et nyt spil.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Rapporter fejl til %s <%s>.\n"
+"Rapporter oversættelsefejl til Dansk-gruppen <dansk@dansk-gruppen.dk>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Rapporter fejl til <%s>.\n"
+"Rapporter oversættelsefejl til Dansk-gruppen <dansk@dansk-gruppen.dk>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Rapporter fejl for %s til <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Hjemmeside for Star Traders: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Andalens stjernefirma"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Bredevang ApS"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capelle - fragtfirmaet"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornaxekspressen"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini A/S"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Herkules og søn"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Indlæser spil %d ... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Første spiller  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Den første spiller er ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Indtast antallet af spillere [^{1^}-^{%d^}] eller ^{<F>^} for at fortsætte et spil: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Ff"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Indtast spilnummer [^{1^}-^{9^}] eller ^{<CTRL><C>^} for at afbryde: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Indtast dit navn: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Har du brug for instruktioner? [^{J^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Indtast spillernavne  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Spiller %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Har en spiller brug for instruktioner? [^{J^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Spillet er slut  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Spillet er slut efter en runde."
+msgstr[1] "Spillet er slut efter %d runder."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Samlet formue  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Din samlede formue var ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Vinderen er ^{%ls^}\n"
+"som er ^[*** KONKURS ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Vinderen er ^{%ls^}\n"
+"med en formue på ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Spillets vinder  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Spiller"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Samlet formue (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Spiller: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Runde: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Sidste runde ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Aktieportefølje  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   K O N K U R S   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Ingen firmaer på kortet"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Firma"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Ejerskab\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Depot\n"
+"(aktier)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Udbytte\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Pris per\n"
+"aktie (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Samlet formue: "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Kontanter:     "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Gæld:          "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Rente:         "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Vis aktieportefølje"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Erklær konkurs"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Gem og afslut spillet"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Afslut spillet"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Vælg handling [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Handling ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Erklær konkurs)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Gem og afslut spillet)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Afslut spillet)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Er du sikker? [^{J^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Gemmer spil %d ... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Konkursretten  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls er blevet erklæret konkurs af Den Interstellare Handelsbank."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls er blevet erklæret konkurs."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Nyt firma  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Et nyt firma er blevet dannet!\n"
+"Dets navn er ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} er blevet fusioneret med ^{%ls^}.\n"
+"Bemærk venligst de følgende transaktioner:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Firmafusion  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Gammel aktie: "
+
+# husk skal være samme længde som ovenstående!!!
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Ny aktie:     "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "I alt"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Nye"
+
+# måske også tidligere kunne bruges, men det er for langt!!!
+# ordet skal også bruges i de efterfølgende sætninger.
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Gammel"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls er blevet erklæret konkurs af Den Interstellare Handelsbank.\n"
+"\n"
+"^{Alle aktiver er blevet beslaglagt som betaling for udestående lån.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls er blevet erklæret konkurs af Den Interstellare Handelsbank.\n"
+"\n"
+"^{Banken har indvilliget i at betale aktionærerne ^}%.2f%%^{ af aktieværdien på hver ejet aktie.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Beløb betalt per aktie: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Gammel aktieværdi:      "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Den Interstellare Handelsbank  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Du blev tvunget til at låne %N\n"
+"for at dække tabene fra dine firmaaktier."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Din gæld er opgjort til %N!\n"
+"^{Banken har reserveret ^}%N^{ fra din kontantbeholdning.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Den Interstellare Aktiebørs  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Aktier\n"
+"tilbage"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Aktier\n"
+"udstedt"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Vis galaksekort"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Besøg Handelsbanken"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Forlad aktiebørsen"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Indtast valg [^[Firmabogstav^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kreditbegr.:   "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Lån penge        "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Tilbagebetal gæld"
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Forlad banken    "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Indtast valg [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Kreditten er ikke tilstrækkelig  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Banken vil ikke lade dig låne flere penge."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Hvor meget ønsker du at låne? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Ingen gæld  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Du har ingen gæld at tilbagebetale."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Ingen kontanter  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Du har ingen kontanter til at tilbagebetale gælden!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Hvor meget ønsker du at betale tilbage? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Aktietransaktion i %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Udstedte aktier:  "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Tilbagev. aktier: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Pris per aktie:   "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Forrentning:      "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Aktuel beholdning:"
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Procent ejet:     "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Kontanter:        "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Køb aktie fra firma"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Sælg aktie tilbage fra firma"
+
+# burde være Anmod firma om at udstede flere aktier
+# men så bliver aktier forkortet væk
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Anmod firma om flere aktier"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Forlad og gå til aktiebørsen"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Indtast valg [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Ingen aktier tilgængelige  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Der er ikke yderligere aktier tilgængelige for køb."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Ikke nok kontanter  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Du har ikke nok kontanter\n"
+"til yderligere aktiekøb."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Du kan købe ^{en^} share."
+msgstr[1] "Du kan købe op til ^{%'ld^} aktier."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Hvor mange aktier ønsker du at købe? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Ingen aktier  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Du har ingen aktier at sælge."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Du kan sælge ^{en^} aktie."
+msgstr[1] "Du kan sælge op til ^{%'ld^} aktier."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Hvor mange aktier ønsker du at sælge? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Ingen aktier udstedt  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls har nægtet\n"
+"at udstede flere aktier."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Aktier udstedt  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls har udstedt\n"
+"^{en^} yderligere aktie."
+msgstr[1] ""
+"%ls har udstedt\n"
+"^{%'ld^} yderligere aktier."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: manglende felt på linje %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: ugyldigt felt på linje %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: ugyldigt felt på linje %d: »%s«"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: ugyldigt felt på linje %d: »%s«"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: ugyldig værdi på linje %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: ugyldige tegn på linje %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: kunne ikke konvertere streng"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Spil blev ikke fundet  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Spillet %d er ikke blevet gemt til harddisken."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Spil blev ikke indlæst  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke indlæses fra harddisken.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: mangler hoved i spilfil"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: ikke en gyldig spilfil"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: mangler underhoved i spilfil"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: gemt under en anden version af Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: gemt med en tegnkodning der ikke er kompatibel"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: ugyldigt eller manglende felt på linje %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Spil blev ikke gemt  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke gemmes til harddisken.\n"
+"\n"
+"^{Mappe %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke gemmes til harddisken.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  er et  simpelt spil  med rumhandel. Formålet  i spillet  er at\n"
+"samle den størst mulige mængde  af rigdom. Dette gøres ved at oprette inter-\n"
+"stellare handelsruter,  udvide dem og  købe aktier i  firmaerne der kontrol-\n"
+"lerer dem. Aktier  stiger i værdi  efterhånden  som firmaets handel udvides.\n"
+"Derudover  ændres aktiernes udbytte (som en procent)  sig også. Spillere kan\n"
+"også låne fra Den Interstellare Handelsbank for at finansiere yderligere køb\n"
+"på aktiebørsen.\n"
+"\n"
+"Galaksens kort er repræsenteret  ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan\n"
+"se således ud:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N repræsenterer ^Bledig plads^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N repræsenterer ^Bstjerne^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Computeren vælger ^B~m^N handlinger (navngivet ^k~1^N til ^k~M^N) vilkårligt,  og placerer\n"
+"dem på kortet. For at vælge et af de fremhævede placeringer, så tryk på bog-\n"
+"stavet. For eksempel kan nogle af handlingerne på kortet være:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N      Flytter ^k~1^N til ^k~5^N vist.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Valg af en position som ^Bikke^N er ved siden af en stjerne  (såsom handlingerne\n"
+"^k~1^N, ^k~3^N eller ^k~5^N)  vil oprette en ^Bforpost^N,  der ikke tilhører  noget firma. Hvis\n"
+"handling 3 vælges på kortet ovenfor  vil en ^o ~+ ^N derfor blive placeret på den\n"
+"placering.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Hvis på den anden side, en placering ved siden af en stjerne (eller en anden\n"
+"forpost) er valgt,  så vil et  ^Bfirma^N  blive dannet og dets bogstav vil frem-\n"
+"komme på kortet. Som belønning for at oprette firmaet, modtager du de første\n"
+"fem aktier. Op til ^B~c^N firmaer kan oprettes på denne måde.\n"
+"\n"
+"Hvis en placering  ved siden  af et eksisterende  firma  vælges  vil firmaet\n"
+"udvide  sine handlinger  med et felt. Dette øger prisen  for dets aktier  og\n"
+"dermed  din  forrentning. Hvis kortet  var vist  som nedenfor  vil valg af ^k~6^N\n"
+"eller ^k~8^N øge firmaet ^B~B^Ns handelsrute:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Handling ^k~6^N eller ^k~8^N øger firma ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Valg af placeringer ved siden af stjerner  øger værdien af din aktie med om-\n"
+"kring fem gange så meget som en udvidelse der ligger et andet sted. Valget ^k~6^N\n"
+"bør derfor foretrækkes for ^k~8^N.\n"
+"\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Handling ^k~6^N foretrækkes for ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"\n"
+"Du kan også udvide et firma ved at vælge placeringer ved siden af forposter.\n"
+"Sådanne forposter  vil blive  opslugt  af det firma. Handling  ^k~1^N  vil udvide\n"
+"firma ^B~C^N med  ^Bto^N  felter. Som en bonus er forposter  ved stjerner mere værdi-\n"
+"fulde: Firmaets aktiepris vil øges mere end forposter placeret andre steder.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Hvis to firmaer  er adskilt på kortet  af kun et felt,  så kan de ^Bfusioneres^N\n"
+"til et firma  ved at vælge  placeringen (hvis tilgængelig). For eksempel, på\n"
+"kortet nedenfor, kan firmaerne  ^B~A^N og ^B~B^N  fusioneres ved at vælge ^k~5^N. Når dette\n"
+"sker overtager  firmaet  med den største  værdi  det mindre  firma.  Her kan\n"
+"firma ^B~B^N overtage firma ^B~A^N. Firmaet ^B~A^N ophører med at eksistere, selvom det kan\n"
+"returnere som et fuldstændig nyt firma på et senere tidspunkt.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Handling ^k~5^N fusionerer firmaerne ^B~A^N og ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Når firmaer fusionerer, får spillerne tildelt aktier i det dominerende firma\n"
+"proportionelt med mængden ejet i det gamle firma. Derudover tildeles en kon-\n"
+"tantbonus, også proportionel til ejerskabet af det gamle firma.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Når du har valgt din handling, så kommer du til ^BDen Interstellare Aktiebørs^N.\n"
+"Her kan du købe aktier, sælge dem, låne fra Handelsbanken  eller betale til-\n"
+"bage  på din  gæld  (hvis du  har gæld). Bemærk  at hver  firma  udsteder et\n"
+"begrænset antal aktier — du kan ikke bare købe ind! Du kan dog anmode om, at\n"
+"der bliver udstedt  flere aktier. Du har  en højere sandsynlighed  for at få\n"
+"succes, hvis du ejer en større andel af firmaet.\n"
+"\n"
+"\n"
+"Spillet slutter normalt efter  ^B~t^N runder. Du kan dog afslutte spillet tidli-\n"
+"gere ved at trykke på ^K<CTRL><C>^N,  når du bliver bedt om en handling. Indivi-\n"
+"duelle spillere kan også erklære sig selv konkurs på ethvert tidspunkt. Hvis\n"
+"din gæld er stor nok risikerer du, at din bank gør det for dig! Hvis du ikke\n"
+"gør spillet færdig i din tilgængelige tid, kan du gemme spillet og fortsætte\n"
+"senere.\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr ""
+"^BVinderen af spillet^N  er personen med den største samlede nettoformue (samlet\n"
+"værdi  for kontanter og aktier  minus gæld). ^HHeld og lykke^N  og må den bedste\n"
+"person vinde!\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Hjælpetekst, side 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Hjælpetekst, side 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Hjælpetekst, side 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Sådan spiller du  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d af %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Tryk <MELLEMRUM> for at fortsætte ] "
+
+# Der er en begrænsning her, kun 76 tegn må bruges
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Tryk <MELLEMRUM> for at fortsætte eller <←> for den forrige side ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: streng har ikke korrekt format: »%s«"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: tegn har ugyldig bredde: »%lc«"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "terminalstørrelse er for lille (%d x %d krævet)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: »%s«"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: ugyldigt tegn i streng: »%ls«"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Jj"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Ja"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Nej"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "ikke nok hukommelse"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: »%s«"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: »%lc«"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: tilvalg »%s« er tvetydigt; muligheder:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: tilvalg »%s« er tvetydigt\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: tilvalg »--%s« tillader ikke et argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: tilvalg »%c%s« tillader ikke et argument\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: tilvalg »--%s« kræver et argument\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: tilvalg blev ikke genkendt »--%s«\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: tilvalg blev ikke genkendt »%c%s«\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ugyldigt tilvalg -- »%c«\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: tilvalg kræver et argument -- »%c«\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: tilvalg »W %s« er tvetydigt\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: tilvalg »-W %s« tillader ikke et argument\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tilvalg »-W %s« kræver et argument\n"
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..11fa456
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,1739 @@
+# *************************************************************************
+# *                                                                       *
+# *                 German Translations for Star Traders                  *
+# *                 Copyright (C) 2012-15, John Zaitseff                  *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Philipp Thomas <pth@suse.de>, 2012, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.7\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-18 09:44+1000\n"
+"PO-Revision-Date: 2015-08-24 11:45+0200\n"
+"Last-Translator: Philipp Thomas <pth@suse.de>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: ungültiger Wert für --max-turn: „%s“\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: ungültiger Operand „%s“\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: ungültige Spielnummer „%s“\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: zusätzlicher Operand „%s“\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright © %s, John Zaitseff.\n"
+"\n"
+"Star Traders ist ein einfaches Spiel um interstellaren Handel.  Das Ziel\n"
+"des Spiels ist es, Firmen zu gründen, Aktien zu kaufen und verkaufen und\n"
+"Geld zu leihen und zurück zu zahlen um der reichste Spieler und damit der\n"
+"Gewinner zu werden.\n"
+"\n"
+"Dieses Programm ist freie Software und wird unter den Bedingungen der GNU\n"
+"General Public License, Version 3 oder später vertrieben.  Sie können es\n"
+"modifizieren und/oder es unter bestimmten Bedingungen vertreiben.  Dieses\n"
+"Programm hat KEINERLEI GARANTIE, soweit die Gesetzgebung dies zulässt;\n"
+"bitte lesen Sie die Lizenz für die Details.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Versuchen Sie „%s --help“ für ausführlichere Informationen.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Aufruf: %s [OPTION ...] [SPIEL]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Options:\n"
+"  -V, --version        Ausgabe der Versionsnummer und beenden des Spiels\n"
+"  -h, --help           diese Hilfe ausgeben und Programm beenden\n"
+"      --no-color       keine Farben für die Ausgabe von Texten verwenden\n"
+"      --max-turn=ZAHL  die maximale Anzahl von Runden auf ZAHL setzten\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Wenn SPIEL als Zahl zwischen 1 und 9 angegeben wird, wird dieses Spiel\n"
+"geladen und fort geführt.  Wird SPIEL nicht angegeben, wird ein neues\n"
+"Spiel gestartet.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Berichten Sie Fehler (in Englisch) an %s <%s>.\n"
+"Fehler in der Übersetzung berichten Sie bitte an\n"
+"<translation-team-de@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Berichten Sie Fehler (in Englisch) an <%s>.\n"
+"Fehler in der Übersetzung berichten Sie bitte an\n"
+"<translation-team-de@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Berichen Sie %s Fehler an <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Star Traders Homepage: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair AG"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Beteleuse GmbH"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Fracht KG"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Spediteure"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Lieferservice"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemeni Inc"
+msgstr "Gemini OHG"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Herkules und Co"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "Nr. 1"
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "Nr. 2"
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "Nr. 3"
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "Nr. 4"
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "Nr. 5"
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "Nr. 6"
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "Nr. 7"
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "Nr. 8"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Spiel %d wird geladen... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Erster Spieler  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Der Spieler der anfängt ist ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr ""
+"Geben Sie die Anzahl der Spieler [^{1^}-^{%d^}] ein\n"
+"oder ^{<W>^} um ein Spiel fortzusetzen: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Ww"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr ""
+"Geben Sie die Spielnummer [^{1^}-^{9^}] ein\n"
+"oder ^{<STRG><C>^} um abzubrechen: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Bitte geben Sie Ihren Namen ein: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Brauchen Sie Instruktionen? [^{J^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Eingabe der Spielernamen  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Spieler %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Braucht einer der Spieler Anweisungen? [^{J^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Spielende  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Das Spiel ist nach einer Runde vorbei."
+msgstr[1] "Das Spiel ist nach %d Runden vorbei."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Wert des Besitzes  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Der Wert Ihres Besitzes ist ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Der Gewinner ist ^{%ls^}\n"
+"er ist ^[*** BANKROTT ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Der Gewinner ist ^{%ls^}\n"
+"mit einem Besitzwert von ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Gewinner des Spiels  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Spieler"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Wert des Besitzes (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Spieler: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Runde: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Letzte Runde ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Aktienportfolio  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N K R O T T  * * * ^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Keine Firmen auf der Karte"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Firma"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Besitz\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Anteile\n"
+"(Aktien)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Dividende\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Preis pro\n"
+"Aktie (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Gesamtwert:  "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Bargeld:     "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Schulden:    "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Zinssatz:    "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Aktienbesitz anzeigen"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Bankrott erklären"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Abspeichern und Spiel beenden"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<STRG><C>^} Beenden des Spiels"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Spielzug wählen [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<STRG><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Spielzug ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Bankrott erklären)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Abspeichern und Spiel beenden)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<STRG><C>^} (Spiel beenden)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Sind Sie sicher? [^{J^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Spiel %d wird gespeichert... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Amtsgericht  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls wurde von der Interstellaren Handelsbank für bankrott erklärt."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls hat Bankrott erklärt."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Neue Firma  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Eine neue Firma wurde gegründet!\n"
+"Ihr Name ist ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} wurde gerade fusioniert mit ^{%ls^}.\n"
+"Bitte beachten Sie die folgenden Transaktionen:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Firmenfusionierung  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Alte Aktien: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Neue Aktien: "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Gesamt"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Neu"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Alt"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls wurde von der Interstellaren Handelsbank für bankrott erklärt.\n"
+"\n"
+"^{Aller Besitz wurde für die Rückzahlung ausstehender Kredite verwendet.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls wurde von der Interstellaren Handelsbank für bankrott erklärt.\n"
+"\n"
+"^{Die Bank wird den Aktionären ^}%.2f%%^{ des Wertes jeder Aktie erstatten.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Anteil pro Aktie bezahlt: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Alter Wert:               "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Interstellare Handelsbank  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Sie mussten sich %N leihen,\n"
+"um die Verluste ihrer Firmenanteile zu decken."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Ihre Schulden belaufen sich auf %N!\n"
+"^{Die Bank hat ^}%N^{ ihres Geldes eingezogen.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Interstellare Börse  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Verfügbare\n"
+"Aktien"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Ausgegeb.\n"
+"Aktien"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Karte der Galaxie anzeigen"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Die Handelsbank aufsuchen"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Die Börse verlassen"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Auswahl eingeben [^[Firmenbuchstabe^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kreditlimit: "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Geld leihen        "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Kredit zurückzahlen"
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Die Bank verlassen "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Auswahl eingeben [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Unzureichendes Kreditlimit  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Die Bank wird Ihnen kein weiteres Geld leihen."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Wie viel wollen Sie borgen? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Keine Schulden  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Sie haben keine zu begleichenden Schulden."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Kein Bargeld  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Sie haben kein Bargeld um Ihre Schulden zu begleichen!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Wieviel wollen Sie zurückzahlen? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Aktientransaktion für %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Ausgegebene Aktien:  "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Verbleibende Aktien: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Preis pro Aktie:     "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Rendite:             "
+
+#. TRANSLATORS: "Current holdings" is the number of shares the
+#. current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Akt. Anteil:     "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:633
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Prozent. Anteil: "
+
+#: src/exch.c:638
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Akt. Bargeld:    "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:651
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Aktien der Firma erwerben"
+
+#: src/exch.c:653
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Aktien der Firma verkaufen"
+
+#: src/exch.c:655
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Ausgabe weiterer Aktien erbitten"
+
+#: src/exch.c:657
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Die Börse verlassen"
+
+#: src/exch.c:660
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Ihre Wahl [^{1^}-^{4^}]: "
+
+#: src/exch.c:716
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Keine Aktien verfügbar  "
+
+#: src/exch.c:717
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Keine erwerbbaren Aktien vorhanden."
+
+#: src/exch.c:721
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Unzureichnedes Bargeld  "
+
+#: src/exch.c:722
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Sie haben nicht genug Bargeld,\n"
+"um zusätzliche Aktien zu erwerben."
+
+#: src/exch.c:733
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Sie können ^{eine^} Aktie erwerben."
+msgstr[1] "Sie können bis zu ^{%'ld^} Aktien erwerben."
+
+#: src/exch.c:739
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Wieviele Aktien wollen Sie erwerben? "
+
+#: src/exch.c:760
+#, c-format
+msgid "  No Shares  "
+msgstr "  Keine Aktien  "
+
+#: src/exch.c:761
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Sie haben keine Aktien zu verkaufen."
+
+#: src/exch.c:768
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Sie können ^{eine^} Aktie verkaufen."
+msgstr[1] "Sie können bis zu ^{%'ld^} Aktien verkaufen."
+
+#: src/exch.c:774
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Wieviele Aktien wollen Sie verkaufen? "
+
+#: src/exch.c:802
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Keine Aktien Ausgegeben  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:804
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls hat sich geweigert,\n"
+"weitere Aktien auszugeben."
+
+#: src/exch.c:809
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Ausgegeben Aktien  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:811
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls hat ^{eine^}\n"
+"weitere Aktie ausgegeben."
+msgstr[1] ""
+"%ls hat ^{%'ld^}\n"
+"weitere Aktien ausgegeben."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: in Zeile %d fehlt ein Feld"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: unzulässiges Feld in Zeile %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: unzulässiges Feld in Zeile %d: „%s“"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: unzulässiger Wert in Zeile %d: „%s“"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: unzulässiger Wert in Zeile %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: unzulässiges Zeichen in Zeile %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: die Zeichenkette konnte nicht umgewandelt werden"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Spiel nicht gefunden  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Spiel %d wurde nicht abgespeichert."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Spiel nicht geladen  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spiel %d konnte nicht geladen werden.\n"
+"\n"
+"^{Spiel %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: Die Spieldatei hat keinen Vorspann"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: ist keine gültige Spieldatei"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: In der Spieldatei fehlt ein zusätzlicher Vorspann"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: wurde unter einer anderen Version von Star Traders gespeichert"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: unter einer inkompatiblen Zeichenkodierung abgespeichert"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: unzulässiges oder fehlendes Feld in Zeile %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Spiel Nicht Gespeichert  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Spiel %d konnte nicht abgespeichert werden.\n"
+"\n"
+"^{Verzeichnis %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spiel %d konnte nicht abgespeichert werden.\n"
+"\n"
+"^{Datei %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N ist  ein  einfaches  Spiel um  instellaren Handel. Das Ziel des\n"
+"Spieles ist das Anhäufen des  grösstmöglichen  Reichtums. Dies wird erreicht\n"
+"durch  das Aufbauen interstellarer Handelsrouten,  ihrer Erweiterung und dem\n"
+"Kauf von Aktien  der Firmen, die sie kontrollieren. Aktien  steigen im Wert,\n"
+"wenn sich die Tätigkeit  der Firma  erweitert. Ausserdem  erhöht  sich damit\n"
+"auch die  prozentuale Dividende. Die Spieler können  sich ausserdem Geld von\n"
+"der  Interstellaren  Handelsbank  leihen,  um  weitere Akteinkäufe zu finan-\n"
+"zieren.\n"
+"\n"
+"Die Karte der Galaxie  wird dargetellt durch ein  ^B~x^N x ^B~y^N  Raster. Ein typi-\n"
+"scher Teil von ihr könnte so aussehen:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N steht für ^Bleeren Raum^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N steht für einen ^BStern^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Der Computer wählt zufällig ^B~m^N Züge (bezeichnet mit ^k~1^N bis ^k~M^N)  trägt  sie auf\n"
+"der Karte  ein. Um eine der hervorgehobenen  Positionen auszuwählen, drücken\n"
+"Sie  den  entsprechenden  Buchstaben. Einige der Züge  auf der Karte könnten\n"
+"z.B. so aussehen:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Züge ^k~1^N bis ^k~5^N angezeigt.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"Die Wahl einer Position die ^Bnicht^N bei einem Stern ist (so wie Züge ^k~1^N, ^k~3^N oder\n"
+"^k~5^N), erstellt einen Aussenposten,  der zu keiner Firma gehört. Wenn daher auf\n"
+"der obigen Karte Zug ^k~3^N gewählt wird,  würde ein  ^o + ^N  an dieser Position er-\n"
+"scheinen.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Wird andererseits eine Position in der Nähe eines Sterns (oder eines anderen\n"
+"Handelspostens)  gewählt, wird  eine  ^BFirma^N  gegründet und ihr Buchstabe er-\n"
+"scheint auf der Karte. Als Belohnung für die Firmengründung erhalten Sie die\n"
+"ersten fünf Aktien. Bis zu ^B~c^N Firmen können so gegründet werden.\n"
+"\n"
+"Wird eine Position in der Nachbarschaft einer Firma gewählt, erweitert diese\n"
+"ihr Geschäft um ein Feld. Dies erhöht den Preis ihrer Aktien und damit Ihren\n"
+"Gewinnanteil. Wäre  die Konstellation also  wie unten, würde  die Wahl von ^k~6^N\n"
+"oder ^k~8^N die Frachtroute der Firma ^B~B^N's ausweiten:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Zug ^k~6^N oder ^k~8^N vergrössert Firma ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Die Wahl  von Positionen neben  Sternen erhöht den Wert Ihrer Aktien um etwa\n"
+"das fünffache einer Position nicht neben einem Stern. Daher sollte Zug ^k~6^N den\n"
+"Vorzug vor Zug ^k~8^N erhalten.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Zug ^k~6^N ist besser als ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Sie  können auch  eine Firma erweitern  indem Sie eine Position neben eienm.\n"
+"Aussenposten wählen. Dieser Aussenposten wird dann von der Firma übernommen.\n"
+"Daher wird Zug ^k~1^N Firma ^B~C^N um ^Bzwei^N Felder erweitern. Ausserdem sind Aussenpos-\n"
+"ten neben einem Stern wertvoller: die  Aktien der Firma werden sich um einen\n"
+"größeren  Betrag  erhöhen als bei Aussenposten, die  nicht neben einem Stern\n"
+"liegen.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Wenn zwei Firmen nur durch ein  Feld auf der Karte getrennt sind, können sie\n"
+"zu einer Firma ^Bfusionieren^N, wenn man diese Position wählt (so verfügbar). So\n"
+"können z.B. auf der Karte unten  die Firmen ^B~A^N und ^B~B^N durch  Wahl von ^k~5^N fusio-\n"
+"niert  werden. Wenn  dies geschieht, übernimmt  die Firma,  deren Besitz den\n"
+"größeren  Wert hat  die andere. Hier  kann  Firma ^B~B^N die  Firma ^B~A^N übernehmen.\n"
+"Firma ^B~A^N hört auf zu  existieren, kann aber als neue Firma wieder auftauchen.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N        Zug ^k~5^N fusioniert Firmen ^B~A^N und ^B~B^N.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"\n"
+"Wenn Firmen fusionieren, bekommen die Spieler Anteile an der dominanten Fir-\n"
+"ma proportional  zu ihrem  Anteil an der alten Firma. Ausserdem erhalten Sie\n"
+"sie einen  Bargeldbonus  proportional zum  prozentualen Anteil  an der alten\n"
+"Firma.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Wenn Sie Ihren Zug gewählt haben, betreten Sie die ^BInterstellare Börse^N. Hier\n"
+"können Sie Aktien kaufen oder  verkaufen, sich von der Handelsbank Geld lei-\n"
+"hen  oder einen Teil  ihrer Schulden  (so vorhanden)  zurückzahlen. Beachten\n"
+"Sie, daß jede  Firma eine beschränkte Zahl von Aktien  ausgibt -- Sie können\n"
+"nicht endlos kaufen! Sie können aber die  Firma  bitten, weitere Aktien aus-\n"
+"zugeben. Je größer ihr Anteil an  der Firma, desdo höher die Chance, das dem\n"
+"statt gegeben wird.\n"
+"\n"
+"\n"
+"Das  Spiel endet normalerweise  nach ^B~t^N  Runden. Sie  können aber  das Spiel\n"
+"vorzeitig  beenden, indem  Sie ^K<STRG><C>^N  drücken, wenn  Sie nach  Ihrem Zug\n"
+"gefragt  werden. Ausserdem  kann  ein Spieler  jederzeit Bankrott  erklären.\n"
+"Wenn Ihre  Schulden hoch genug sind,  macht das eventuell die  Bank für Sie!\n"
+"Reicht die  Zeit nicht aus,  um das Spiel  zu beenden, können Sie  es abspei\n"
+"chern und später fortsetzen.\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr ""
+"Der ^BGewinner des Spiels^N ist die  Person mit dem größten Nettowert (Summe aus\n"
+"Bargeld, Aktien und Schulden). ^HViel Glück^N, möge der Beste gewinnen!\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Hilfe, Seite 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Hilfe, Seite 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Hilfe, Seite 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Spielanleitung  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Seite %d von %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ <LEERTASTE> drücken um fortzufahren ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ <LEERTASTE> für nächste, <RÜCKSCHRITT> für vorherige Seite ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: Die Zeichenkette hat ein falsches Format: „%s“"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: Das Zeichen hat eine unzulässige Breite: „%lc“"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "Das Terminal ist zu klein (Mindestgröße ist %d x %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NULL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: „%s“"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: unzulässiges Zeichen in Zeichenkette „%ls“"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Jj"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Ja"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Nein"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "Kein frier Speicer mehr vorhanden"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: „%s“"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: „%lc“"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: Option „%s“ ist mehrdeutig; möglich wären:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: Option „%s“ ist mehrdeutig\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: Option „--%s“ erfordert ein Argumente\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: unbekannte Option „--%s“\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: unbekannte Option „%c%s“\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ungültige Option -- „%c“\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: die Option erfordert ein Argument -- „%c“\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Option „-W %s“ erfordert ein Argument\n"
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..e6ed6e1
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,1723 @@
+# *************************************************************************
+# *                                                                       *
+# *            English (British) Translations for Star Traders            *
+# *                Copyright (C) 1990-2015, John Zaitseff                 *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same licence as Star Traders.
+#
+# Contributors:
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-15.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 21:10+1000\n"
+"PO-Revision-Date: 2015-08-18 08:07+1000\n"
+"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
+"Language-Team: English (British)\n"
+"Language: en_GB\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: invalid value for --max-turn: ‘%s’\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: invalid operand ‘%s’\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: invalid game number ‘%s’\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: extra operand ‘%s’\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Try ‘%s --help’ for more information.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Usage: %s [OPTION ...] [GAME]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-colour      don’t use colour for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr "Report bugs to %s <%s>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr "Report bugs to <%s>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Report %s bugs to <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Star Traders home page: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair Starways"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse, Ltd"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Freight Co"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Shippers"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Expediters"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini Inc"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Hercules and Co"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1st"
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2nd"
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3rd"
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4th"
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5th"
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6th"
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7th"
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8th"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Loading game %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  First Player  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "The first player to go is ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Cc"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Please enter your name: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Do you need any instructions? [^{Y^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Enter Player Names  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Player %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Does any player need instructions? [^{Y^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Game Over  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "The game is over after one turn."
+msgstr[1] "The game is over after %d turns."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Total Value  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Your total value was ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Game Winner  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Player"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Total Value (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Player: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Turn: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Last Turn ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Stock Portfolio  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N K R U P T   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "No companies on the map"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Company"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Ownership\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Holdings\n"
+"(shares)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Return\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Price per\n"
+"share (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Total value:   "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Current cash:  "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Current debt:  "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Interest rate: "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Display stock portfolio"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Declare bankruptcy"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Save and end the game"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Quit the game"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Move ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Declare bankruptcy)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Save and end the game)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Quit the game)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Are you sure? [^{Y^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Saving game %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Bankruptcy Court  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls has declared bankruptcy."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  New Company  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Company Merger  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Old stock: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "New Stock: "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Total"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "New"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Old"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Amount paid per share: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Old share value:       "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Interstellar Trading Bank  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Interstellar Stock Exchange  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Shares\n"
+"left"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Shares\n"
+"issued"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Display galaxy map"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Visit the Trading Bank"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Exit the Stock Exchange"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Credit limit:  "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Borrow money      "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Repay debt        "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Exit from the Bank"
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Enter selection [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Insufficient Credit Limit  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "The Bank will not lend you any more money."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "How much do you wish to borrow? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  No Debt  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "You have no debt to repay."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  No Cash  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "You have no cash with which to repay the debt!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "How much do you wish to repay? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Stock Transaction in %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Shares issued:   "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Shares left:     "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Price per share: "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Return:          "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Current holdings: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Percentage owned: "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Current cash:     "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Buy stock from company"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Sell stock back to company"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Bid company to issue more shares"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Exit to the Stock Exchange"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Enter selection [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  No Shares Available  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "No more shares are available for purchase."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Insufficient Cash  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "You can purchase ^{one^} share."
+msgstr[1] "You can purchase up to ^{%'ld^} shares."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "How many shares do you wish to purchase? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  No Shares  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "You do not have any shares to sell."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "You can sell ^{one^} share."
+msgstr[1] "You can sell up to ^{%'ld^} shares."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "How many shares do you wish to sell? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  No Shares Issued  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls has refused\n"
+"to issue more shares."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Shares Issued  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls has issued\n"
+"^{one^} more share."
+msgstr[1] ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: missing field on line %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: illegal field on line %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: illegal field on line %d: ‘%s’"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: illegal value on line %d: ‘%s’"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: illegal value on line %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: illegal characters on line %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: could not convert string"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Game Not Found  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Game %d has not been saved to disk."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Game Not Loaded  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: missing header in game file"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: not a valid game file"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: missing subheader in game file"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: saved under a different version of Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: saved under an incompatible character encoding"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: illegal or missing field on line %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Game Not Saved  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"The computer selects ^B~m^N moves (labelled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N’s shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company’s share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Help text, page 7\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Help text, page 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Help text, page 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Help text, page 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  How to Play  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d of %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Press <SPACE> to continue ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: string has incorrect format: ‘%s’"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: character has illegal width: ‘%lc’"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "terminal size is too small (%d x %d required)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: ‘%s’"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: illegal character in string: ‘%ls’"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Yy"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Yes"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "No"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "out of memory"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: ‘%s’"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: ‘%lc’"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option ‘%s’ is ambiguous\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: option ‘--%s’ requires an argument\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: unrecognised option ‘--%s’\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: unrecognised option ‘%c%s’\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: invalid option -- ‘%c’\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: option requires an argument -- ‘%c’\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: option ‘-W %s’ is ambiguous\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 0000000..6287f93
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,1731 @@
+# *************************************************************************
+# *                                                                       *
+# *                Esperanto Translations for Star Traders                *
+# *                   Copyright (C) 2013, 2016 John Zaitseff              *
+# *          Copyright (C) 2013, 2016 Free Software Foundation, Inc.      *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Felipe Castro <fefcas@gmail.com>, 2013, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.9\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2016-01-05 10:52+1100\n"
+"PO-Revision-Date: 2016-02-14 22:32-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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: Poedit 1.6.10\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: malvalida valoro por --max-turn: '%s'\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: malvalida argumento '%s'\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: malvalida seanc-numero '%s'\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: troa argumento: '%s'\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Kopirajto (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders estas simpla ludo pri interstelara komerco, kie la celo de la\n"
+"ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj repagi\n"
+"monon, por fariĝi la plej riĉa ludanto (la venkanto).\n"
+"\n"
+"Tiu ĉi programo estas libera programaro, kiu estas disdonata sub la kondiĉoj\n"
+"de la GNU-a Ĝenerala Publika Permesilo, versio 3 aŭ posta.  Vi estas bonvena\n"
+"por modifi kaj/aŭ disdoni ĝin sub kelkaj kondiĉoj.  Tiu ĉi programo venas kun\n"
+"NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la Permesilon\n"
+"por pli da detaloj.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Provu '%s --help' por pli da informoj.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Uzmaniero: %s [MODIFILO ...] [SEANCO]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Ludi Star Traders, simpla ludo pri interstelara komerco.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Modifiloj:\n"
+"  -V, --version        montri informon pri versio kaj eliri\n"
+"  -h, --help           montri tiun ĉi helpon kaj eliri\n"
+"      --no-color       ne uzi kolorojn por montrigi tekston\n"
+"      --max-turn=NUM   difini la nombron da cikloj kiel NUM\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Se SEANCO estas indikita kiel numero inter 1 kaj 9, ŝargi kaj daŭrigi\n"
+"ludadon de tiu seanco.  Se SEANCO ne aperas, ekigi novan seancon.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Raportu program-misojn al: %s <%s>.\n"
+"Raportu traduk-misojn al: <translation-team-eo@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Raportu program-misojn al: <%s>.\n"
+"Raportu traduk-misojn al: <translation-team-eo@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Raportu %s-misojn al <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Hejmpaĝo de Star Traders: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altairaj Stelvojoj"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelĝuza, Klr"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Frajto Ko"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebolaj Ŝipistoj"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridanaj Frajtistoj"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornakso Ekspresa"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Ĝemeloj Enk"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Herkulo kaj Ko"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "abcdefgh|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "abcdefghijklmnoprstu|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".@*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnoprstu|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1a"
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2a"
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3a"
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4a"
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5a"
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6a"
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7a"
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8a"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Ŝargado de la seanco %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Unua ludanto  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "La unua ludanto kiu moviĝos estas ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Indiku nombron da ludantoj [^{1^}-^{%d^}] aŭ ^{<D>^} por daŭrigi seancon: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Dd"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Indiku seanc-numeron [^{1^}-^{9^}] aŭ ^{<CTRL><C>^} por nuligi: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Bonvolu indiki vian nomon: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Ĉu vi bezonas instrukciojn? [^{J^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Indiku ludant-nomojn  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Ludanto %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Ĉu iu ludanto bezonas instrukciojn? [^{J^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Ludo-fino  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "La ludo finiĝas post unu ciklo."
+msgstr[1] "La ludo finiĝas post %d cikloj."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Totalo  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Via totalo estis ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"La venkanto estas ^{%ls^}\n"
+"kiu estas ^[*** BANKROTINTO ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"La venkanto estas ^{%ls^}\n"
+"kun totalo ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Lud-venkanto  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Ludanto"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Totalo (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Ludanto: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Ciklo: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Lasta ciklo ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Akcio-portalo  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N K R O T A   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Neniu kompanio sur la mapo"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Kompanio"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Posedo\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Havaĵoj\n"
+"(akcioj)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Rendimento\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Prezo por\n"
+"akcio (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Totalo:      "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Nuna mono:   "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Nuna ŝuldo:  "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Interezo:    "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Montri la akci-portalon"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Deklari bankroton"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Konservi seancon kaj eliri"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Eliri la ludon"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Movo ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Deklari bankroton)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Konservi kaj eliri)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Eliri la ludon)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Ĉu vi certas? [^{J^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Konservado de la seanco %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Bankrota kortumo  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls deklaris bankroton."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Nova kompanio  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Nova kompanio naskiĝis!\n"
+"Ĝi nomiĝas ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} ĵus kunfandiĝis al ^{%ls^}.\n"
+"Bonvolu rimarki la jenajn transakciojn:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Kompani-kunfandisto  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Malnova akcio: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Nova akcio:    "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Premio (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Totalo"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Nova"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Malnova"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota.\n"
+"\n"
+"^{Ĉiuj havaĵoj estis prenataj por repagi gravajn pruntojn.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls estis deklarata de la Interstelara Komerca Banko kiel bankrota.\n"
+"\n"
+"^{La banko konsentis pagi al akci-tenantoj ^}%.2f%%^{ el la akci-valoro de ĉiu posedita akcio.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Kvanto pagita por akcio: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Malnova akci-valoro:     "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Interstelara Komerca Banko  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Vi estis devigata pruntepreni %N\n"
+"por kovri perdojn el kompani-akcioj."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Via ŝuldo amasiĝis al %N!\n"
+"^{La banko rezerv-prenis ^}%N^{ el via mono.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Interstelara akci-interŝanĝejo  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Akcioj\n"
+"lasitaj"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Akcioj\n"
+"venditaj"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Montri galaksi-mapon"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Viziti la Komercan Bankon"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Eliri la akci-interŝanĝejon"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Indiku elekton [^[Kompani-litero^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kredit-limo: "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Pruntepreni monon"
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Repagi ŝuldon    "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Eliri la bankon  "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Indiku elekton [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Nesufiĉa kredit-limo  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "La banko ne pruntedonos al vi pli da mono."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Kiom vi deziras pruntepreni? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Sen ŝuldo  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Vi havas neniom da ŝuldo por repagi."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Sen mono  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Vi havan neniom da mono por repagi la ŝuldon!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Kiom vi deziras repagi? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Akcia transakcio en %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Akcioj venditaj: "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Akcioj lasitaj:  "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Prezo por akcio: "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Rendimento:      "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Nunaj havaĵoj:    "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Elcento posedita: "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Nuna mono:        "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Aĉeti akcion el kompanio"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Vendi akcion reen al kompanio"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Peti kompanion vendi pli akciojn"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Eliri la akci-interŝanĝejon"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Indiku elekton [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Neniu akcio disponeblas  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Neniu plia akcio disponeblas por aĉeto."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Nesufiĉe da mono  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Vi ne havas sufiĉe da mono\n"
+"por aĉeti aldonajn akciojn."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Vi povas aĉeti ^{unu^} akcion."
+msgstr[1] "Vi povas aĉeti ĝis ^{%'ld^} akciojn."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Kiom da akcioj vi deziras aĉeti? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Neniu akcio  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Vi havas neniun akcio por vendi."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Vi povas vendi ^{unu^} akcion."
+msgstr[1] "Vi povas vendi ĝis ^{%'ld^} akciojn."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Kiom da akcioj vi deziras vendi? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Neniu akcio vendita  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls rifuzis\n"
+"disponigi pli da akcioj."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Akcioj venditaj  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls disponigis\n"
+"^{unu^} plian akcion."
+msgstr[1] ""
+"%ls disponigis\n"
+"^{%'ld^} pliajn akciojn."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: mankas kampon en linio %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: malpermesata kampo en linio %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: malpermesata kampo en linio %d: '%s'"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: malpermesata valoro en linio %d: '%s'"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: malpermesata valoro en linio %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: malpermesataj signoj en linio %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: ne eblis konverti ĉenon"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Seanco ne trovita  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "La seanco %d ne estas konservita en la disko."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Seanco ne ŝargita  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"La seanco %d ne povis esti ŝargata el la disko.\n"
+"\n"
+"^{Dosiero %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: mankas kaplinio en seanc-dosiero"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: ne estas valida seanc-dosiero"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: mankas subkaplinio en seanc-dosiero"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: konservita sub malsama versio de Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: konservita sub nekongrua signa enkodigo"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: malpermesata aŭ mankanta kampo en linio %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Seanco ne konservita  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"La seanco %d ne povis esti konservata en la disko.\n"
+"\n"
+"^{Dosierujo %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"La seanco %d ne povis esti konservata en la disko.\n"
+"\n"
+"^{Dosiero %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  estas simpla ludo  pri interstelara  komerco.  Ĝia celo  estas\n"
+"amasigi la plej grandan kvanton da riĉeco ebla.  Tion oni atingas per kreado\n"
+"de interstelaraj ŝipaj vojoj, pligrandigante ilin kaj aĉetante akciojn en la\n"
+"kompanioj  kiuj  regas  ilin.  Akcioj  plivaloriĝas  laŭ  la progreso  de la\n"
+"operacioj  de la kompanio.  Cetere,  la rendimento  de ĉiu akcio  (procente)\n"
+"ankaŭ ŝanĝas.  Ludantoj povas  ankaŭ pruntepreni  el la Interstelara Komerca\n"
+"Banko por financi aldonajn aĉetojn en la akci-interŝanĝejo.\n"
+"\n"
+"La galaksi-mapo estas reprezentata  per krado  ^B~x^N x ^B~y^N.  Ordinara areo de ĝi\n"
+"povas esti:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N      ^e ~. ^N reprezentas ^Bvakan spacon^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N      ^s ~* ^N reprezentas ^Bstelon^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"La komputilo elektas hazarde  ^B~m^N movojn  (etikeditaj per ^k~1^N al ^k~M^N),  kaj metas\n"
+"ilin sur la mapo.  Por elekti iun  el la reliefigitaj  pozicioj,  premu tiun\n"
+"literon.  Ekzemple, kelkaj el la movoj sur la mapo povas esti:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Movoj de ^k~1^N al ^k~5^N estas montrataj.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Elekti  pozicion  kiu ^Bne^N estas proksime  de stelo  (kiel la movoj ^k~1^N, ^k~3^N aŭ ^k~5^N)\n"
+"rezultas en difino de ^Bpikedo^N,  ne apartenanta al iu ajn kompanio.  Do, se la\n"
+"movo ^k~3^N estus elektata en la supra mapo, ^o ~+ ^N estus metota ĉe tiu pozicio.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Alimaniere, se pozicio proksime de stelo aŭ  de alia pikedo  estus elektata,\n"
+"^Bkompanio^N  estus  kreota kaj  ĝia litero  estus  aperonta  en la  mapo.  Kiel\n"
+"premio  por kreo  de kompanio,  vi ricevas  la unuajn  kvin  akciojn.  Ĝis ^B~c^N\n"
+"kompanioj povas esti tiel kreataj.\n"
+"\n"
+"Se pozicio  proksime de kompanio estus elektata, la kompanio  pliampleksigus\n"
+"ĝiajn operaciojn je unu kvadrato.  Tio pliigus la koston  de ĝiaj akcioj kaj\n"
+"tiel ankaŭ la rendimento pliiĝus.  Do, se la mapo  estus kiel montrate sube,\n"
+"elekto de ^k~6^N aŭ ^k~8^N pligrandigas la ŝip-vojon de la kompanio ^B~B^N:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Movoj ^k~6^N aŭ ^k~8^N pligrandigas kompanion ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Elekto de pozicio proksime  de steloj plivalorigas viajn  akciojn proksimume\n"
+"kvinoble ol pozicio ne proksime de stelo.  Do la movo ^k~6^N devus esti preferata\n"
+"ol la movo ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Movo ^k~6^N estas preferata ol ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Vi povas ankaŭ pligrandigi iun ajn kompanion elektante  poziciojn proksimajn\n"
+"de pikedoj.  Tiaj pikedoj  estos englutitaj  de tiu kompanio.  Do, la movo ^k~1^N\n"
+"pligrandigos la kompanion ^B~C^N per  ^Bdu^N  kvadratoj.  Kiel premio, pikedoj  prok-\n"
+"simaj al steloj estas pli valoraj:  la akci-prezo de la kompanio altiĝas pli\n"
+"ol se la pikedo ne estas proksima de steloj.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Se du kompanioj  estas apartitaj en la mapo per nur  unu kvadrato,  tiam ili\n"
+"povas  esti ^Bkunfanditaj^N  en unu kompanio  per elekto  de tiu pozicio (nur se\n"
+"disponebla).  Ekzemple, en la suba mapo, kompanioj ^B~A^N kaj ^B~B^N  povas kunfandiĝi\n"
+"per elekto de ^k~5^N.  Kiam tio okazas, la kompanio  kun pli da havaĵoj akiras la\n"
+"alian.  Ĉi tie, la kompanio ^B~B^N  povus akiri la kompanion ^B~A^N.  Kompanio ^B~A^N ĉesas\n"
+"ekzisti, kvankam ĝi povos reaperi kiel entute nova kompanio pli poste.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N    Movo ^k~5^N kunfandigas kompaniojn ^B~A^N kaj ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Kiam kompanioj  kunfandiĝas,  la ludantoj ricevas akciojn  de la mastrumanta\n"
+"kompanio proporcie al la kvanto posedita en la malnova kompanio.  Kaj premio\n"
+"estas ankaŭ pagita, proporcie al la procenta posedo de la malnova kompanio.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Tuj post  kiam vi  elektas  vian movon,  vi eniras la  ^BInterstelaran  akcian\n"
+"interŝanĝejon^N.  Tie vi  povas aĉeti akciojn,  vendi ilin,  pruntepreni el la\n"
+"Komerca Banko  aŭ repagi  iom el via ŝuldo  (se ekzistanta).  Rimarku ke ĉiu\n"
+"kompanio  disponigas limigitan  nombron da akcioj -- vi ne  povas aĉeti sen-\n"
+"fine!  Tamen, vi povas  peti ke pli da akcioj  estu vendataj.  Vi pli ŝancas\n"
+"sukcesi se vi posedas pli grandan proporcion de la kompanio.\n"
+"\n"
+"La ludo  ordinare finas  post ^B~t^N cikloj.  Tamen, vi povas fini  la ludon pli\n"
+"frue premante  ^K<CTRL><C>^N  kiam aldemandita elekti movon.  Krome,  individuaj\n"
+"ludantoj  povas sin deklari  bankrotaj iam ajn.  Se via  ŝuldo estas  sufiĉe\n"
+"granda, la banko  povas fari tion por vi!  Se vi ne plenumas  la ludon en la\n"
+"tempo kiun vi disponas, vi povas konservi seancon kaj daŭrigi ĝin poste.\n"
+"\n"
+"\n"
+"La ^Bvenkanto de la ludo^N  estas tiu kun la plej  granda totalo  (entuta valoro\n"
+"de mono, akcioj kaj ŝuldo).  ^HBonan ŝancon^N kaj ke la plej lerta venku!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Kiel ludi  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Paĝo %d el %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Premu <SPACOn> por daŭrigi ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Premu <SPACOn> por daŭrigi aŭ <RETROPAŜOn> por la antaŭa paĝo ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: ĉeno havas malĝustan formon: '%s'"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: signo havas malpermesatan larĝon: '%lc'"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "terminal-grando tro malgrandas (necesas %d x %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: '%s'"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: malpermesata signo en ĉeno: '%ls'"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "JjYy"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Jes"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Ne"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "memoro plenpleniĝas"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: '%s'"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: '%lc'"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: la modifilo '%s' estas plursenca\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: la modifilo '--%s' ne permesas argumenton\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: la modifilo '--%s' postulas argumenton\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: nerekonata modifilo '--%s'\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: nerekonata modifilo '%c%s'\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: malvalida modifilo -- '%c'\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: la modifilo postulas argumenton -- '%c'\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: la modifilo '-W %s' estas plursenca\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: la modifilo '-W %s' postulas argumenton\n"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..00e5ebb
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,1733 @@
+# *                                                                       *
+# *                 Finnish Translations for Star Traders                 *
+# *                   Copyright (C) 2012, John Zaitseff                   *
+# *          Copyright (C) 2012, Free Software Foundation, Inc.           *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Jorma Karvonen <karvonen.jorma@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-09-19 13:47+0300\n"
+"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: virheellinen arvo valitsimelle --max-turn: ”%s”\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: virheellinen operandi ”%s”\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: virheellinen pelinumero ”%s”\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: ylimääräinen operandi ”%s”\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Tähtikauppiaat (%s) %s\n"
+"Copyright © %s, John Zaitseff.\n"
+"\n"
+"Tähtikauppiaat on yksinkertainen tähtienvälisen kaupan peli, jossa pelin\n"
+"tarkoitus on luoda yhtiöitä, ostaa ja myydä osakkeita, lainata ja maksaa\n"
+"takaisin rahaa, tarkoituksena tulla varakkaimmaksi pelaajaksi (voittaja).\n"
+"\n"
+"Tämä ohjelma on vapaa ohjelmisto, jota jaetaan GNU General Public License-\n"
+"lisenssin, versio 3 tai myöhäisempi ehtojen alaisena.  Voit vapaasti muokata\n"
+"ja/tai jakaa sitä edelleen tiettyjen ehtojen mukaisesti.  Tällä ohjelmalla\n"
+"EI OLE TAKUUTA, lain sallimassa laajuudessa; katso yksityiskohdat lisenssistä.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Lisätietoja saa komennolla ”%s --help”.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Käyttö: %s [VALITSIN ...] [PELI]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Valitsimet:\n"
+"  -V, --version        tulosta versiotiedot ja poistu\n"
+"  -h, --help           näytä tämä opaste ja poistu\n"
+"      --no-color       älä käytä väriä tekstin näyttämiseen\n"
+"      --max-turn=NUM   aseta kierrrosten lukumääräksi NUM\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Jos PELI on määritelty numerona välillä 1 ... 9, lataa ja jatka tuon\n"
+"pelin pelaamista.  Jos PELIä ei ole määritelty, aloita uusi peli.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Ilmoita vioista (englanniksi) osoitteeseen %s\n"
+"<%s>.  Ilmoita käännösvirheistä osoitteeseen\n"
+"<translation-team-fi@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Ilmoita vioista (englanniksi) osoitteeseen <%s>.\n"
+"Ilmoita käännösvirheistä osoitteeseen\n"
+"<translation-team-fi@lists.sourceforge.net>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr ""
+"Ilmoita %s-vioista (englanniksi) osoitteeseen <%s>.\n"
+"Ilmoita käännösvirheistä osoitteeseen\n"
+"<translation-team-fi@lists.sourceforge.net>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Tähtikauppiaiden kotisivu: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair Starways"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse, Ltd"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Freight Co"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Shippers"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Expediters"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini Inc"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Hercules and Co"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Ladataan peli %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Ensimmäinen pelaaja  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Ensimmäinen menevä pelaaja on ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Kirjoita pelaajien lukumäärä [^{1^}-^{%d^}] tai ^{<C>^} pelin jatkamiseksi: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Cc"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Kirjoita pelin numero [^{1^}-^{9^}] tai ^{<CTRL><C>^} peruuttamiseksi: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Kirjoita nimesi: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Tarvitsetko lisäohjeita? [^{K^}/^{E^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Kirjoita pelaajanimet  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Pelaaja %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Tarvitseeko kukaan pelaaja ohjeita? [^{K^}/^{E^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Peli päättyi  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Peli päättyi yhden kierroksen jälkeen."
+msgstr[1] "Peli päättyi %d kierroksen jälkeen."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Kokonaisarvo  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Kokonaisarvosi oli ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Voittaja on ^{%ls^}\n"
+"joka on ^[*** KONKURSSISSA ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Voittaja on ^{%ls^}\n"
+"arvolla ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Pelin voittaja  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Pelaaja"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Kokonaisarvo (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Pelaaja: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Kierros: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Viimeinen kierros ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Osakesalkku  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   K O N K U R S S I   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Kartalla ei ole yrityksiä"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Yritys"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Omistajuus\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Omistusosa\n"
+"(osakkeet)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Tuotto\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Hinta per\n"
+"osake (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Kokonaisarvo:   "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Käteiskassa:    "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Velat:          "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Korkoprosentti: "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Näytä osakesalkku"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Julista konkurssi"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Tallenna ja lopeta peli"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Poistu pelistä"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Valitse siirto [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Siirto ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Julista konkurssi)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Tallenna ja lopeta peli)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Poistu pelistä)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Oletko varma? [^{K^}/^{E^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Tallennetaan peliä %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Konkurssioikeus  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "Tähtienvälinen Kauppapankki on julistanut yrityksen %ls konkurssiin."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls on julistettu konkurssiin."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Uusi yritys  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Uusi yritys on muodostettu!\n"
+"Sen nimi on ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} on juuri yhdistetty yritykseen ^{%ls^}.\n"
+"Huomaa seuraavat rahansiirrot:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Yritysyhdistäjä  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Vanha osakekanta: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Uusi osakekanta:  "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Yhteensä"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Uusi"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Vanha"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"Tähtienvälinen Kauppapankki on julistanut yrityksen %ls konkurssiin.\n"
+"\n"
+"^{Kaikki varat on otettu maksamattomien lainojen maksamiseen.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"Tähtienvälinen Kauppapankki on julkistanut yrityksen %ls konkurssiin.\n"
+"\n"
+"^{Pankki on suostunut maksamaan osakkeenomistajille ^}%.2f%%^{ / osakearvosta jokaiselle omistetulle osakkeelle.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Maksettu summa per osake: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Vanha osakearvo:          "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Tähtienvälinen Kauppapankki  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Sinun oli pakko lainata %N\n"
+"kattaaksesi tappiot yrityksen osakkeista."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Velkasi ovat yhteensä %N!\n"
+"^{Pankki on takavarikoinnut ^}%N^{ käteisvaroistasi.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Tähtienvälinen osakepörssi  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Osaketta\n"
+"jäljellä"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Osakkeita\n"
+"myyty"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Näytä galaksikartta"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Vieraile Kauppapankissa"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Poistu osakepörssistä"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Kirjoita valinta [^[Yrityskirjain^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Luottoraja:     "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Lainarahat     "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Maksetut velat "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Poistu pankista"
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Kirjoita valinta [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Riittämätön luottoraja  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Pankki ei enää lainaa sinulle rahaa."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Kuinka paljon haluat lainata? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Ei velkaa  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Sinulla ei ole maksettavia velkoja."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Ei käteistä  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Sinulla ei ole käteistä, jolla voisit maksaa velan!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Kuinka paljon haluat maksaa? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Osakekantasiirto yrityksessä %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Myydyt osakkeet:   "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Loput osakkeet:  "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Hinta per osake: "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Tuotto:          "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Nykyomistusosuus: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Omistusprosentti: "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Käteiskassa:      "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Osta osakekanta yritykseltä"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Myy osakekanta taas yritykselle"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Pyydä lisäosakkeita yritykseltä"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Poistu osakepörssistä"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Kirjoita valinta [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Osakkeita ei ole saatavilla  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Osakkeita ei ole enää saatavilla ostoa varten."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Riittämättömästi käteistä  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Sinulla ei ole riittävästi käteistä\n"
+"lisäosakkeiden ostamiseen."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Voit osataa ^{yhden^} osakkeen."
+msgstr[1] "Voit ostaa aina ^{%'ld^} osaketta."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Kuinka monta osaketta haluat ostaa? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Ei osakkeita  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Sinulla ei ole myytäviä osakkeita."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Voit myydä ^{yhden^} osakkeen."
+msgstr[1] "Voit myydä ^{%'ld^} osaketta."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Kuinka monta osaketta haluat myydä? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Ei myytäviä osakkeita  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls on kieltäytynyt\n"
+"myymästä lisää osakkeita."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Myydyt osakkeet  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls on myynyt\n"
+"^{yhden^} osakkeen lisää."
+msgstr[1] ""
+"%ls on myynyt\n"
+"^{%'ld^} osaketta lisää."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: kenttä puuttuu rivillä %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: virheellinen kenttä rivillä %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: virheellinen kenttä rivillä %d: ”%s”"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: virheellinen arvo rivillä %d: ”%s”"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: virheellinen arvo rivillä %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: virheelliset merkit rivillä %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: ei voitu muuntaa merkkijonoa"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Peliä ei löytynyt  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Peliä %d ei ole tallennetu levylle."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Peliä ei ladattu  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Peliä %d ei voitu ladata levyltä.\n"
+"\n"
+"^{Tiedosto %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: pelitiedostosta puuttuu otsake"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: ei ole kelvollinen pelitiedosto"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: pelitiedostosta puuttuu aliotsake"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: tallennettu Tähtikauppiaiden eri versiona"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: tallennettu yhteensopimattomana merkkikoodauksena"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: virheellinen tai puuttuva kenttä rivillä %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Peliä ei tallennettu  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Peliä %d ei voitu tallentaa levylle.\n"
+"\n"
+"^{Hakemisto %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Peliä %d ei voitu tallentaa levylle.\n"
+"\n"
+"^{Tiedosto %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BTähtikauppiaat^N on yksinkertainen  tähtienvälisen kaupan peli.  Pelin tarkoi-\n"
+"tus on kerätä suurin mahdollinen omaisuus.  Tämä tehdään luomalla tähtienvä-\n"
+"lisiä laivausväyliä, laajentamalla niitä ja ostamalla osakkeita niitä valvo-\n"
+"vista yrityksistä.   Osakkeet nousevat arvossa  kun yritystoiminnot laajene-\n"
+"vat.   Sen lisäksi  jokaisen  osakkeen tuotto  (prosentteina) myös  vaihtuu.\n"
+"Pelaajat  voivat myös  lainata  Tähtienvälisestä Kauppapankista  lisäostojen\n"
+"rahoittamiseksi osakepörssissä.\n"
+"\n"
+"Rasteri ^B~x^N x ^B~y^N edustaa galaksikarttaa.  Sen tyypillinen lohko voi olla:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N edustaa ^Btyhjää avaruutta^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N edustaa ^Btähteä^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Tietokone valitsee ^B~m^N siirtoa (nimiöity ^k~1^N ... ^k~M^N) satunnaisesti, ja sijoittaa\n"
+"ne kartalle.  Minkä tahansa  korostetun sijainnin valitsemiseksi, paina kir-\n"
+"jainta.  Esimerkiksi, jotkut siirrot kartalla voivat olla:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Siirtoa ^k~1^N kohteeseen ^k~5^N näytetty.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Sellaisen  sijainnin valitseminen,  joka ^Bei^N  ole tähden  vieressä (sellaiset\n"
+"siirrot kuten ^k~1^N, ^k~3^N tai ^k~5^N)  asettaa ^Betuvartion^N,  mikä ei kuulu millekään yri-\n"
+"tykselle.  Siten  jos siirto ^k~3^N valitaan  siirtokartalta, ^o ~+ ^N sijoitettaisiin\n"
+"tuohon sijaintiin.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Jos  toisaalta valitaan  sijainti tähden  (tai toisen  etuvartion) vierestä,\n"
+"niin ^Byritys^N muodostettaisiin ja sen kirjain ilmaantuisi kartalle.  Palkkiona\n"
+"yrityksen luomisesta sinulle myönnetään  viisi ensimmäistä osaketta.  Aina ^B~c^N\n"
+"yritystä voidaan luoda tällä tavalla.\n"
+"\n"
+"Jos valitaan sijainti olemassa olevan yrityksen vierestä, yritys laajentaisi\n"
+"toimintaansa  yhdellä neliöllä.   Tämä  kasvattaa sen  osakkeiden hintaa  ja\n"
+"siten tuottoasi.  Siten, jos alla oleva kartta näytetään, valitsemalla ^k~6^N tai\n"
+"^k~8^N kasvatat Yrityksen ^B~B^N laivausväylää:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Siirto ^k~6^N tai ^k~8^N kasvattaa Yritystä ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Sijaintien valitseminen tähtien  vierestä kasvattaa osakekantasi arvoa viisi\n"
+"kertaa niin paljon  kuin laajentaminen, joka ei ole  tähden vieressä.  Siten\n"
+"siirto ^k~6^N olisi etusijainen siirtoon ^k~8^N verrattuna.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Siirto ^k~6^N on etusijainen siirtoon ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Voit  myös laajentaa  mitä  tahansa yritystä  valitsemalla sijainnit  niiden\n"
+"etuvartion  vierestä. Yritys  nielee sellaiset  etuvartiot.  Siten  siirto ^k~1^N\n"
+"laajentaa Yritystä ^k~C^N  ^Bkahdella^N neliöllä.  Bonuksena  tähtien viereiset etuvartiot\n"
+"ovat arvokkaampia: yrityksen osakkeen hinta nousee suuremmalla summalla kuin\n"
+"se nousisi niillä etuvartioilla, jotka eivät ole tähtien vieressä.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Jos vain neliö erottaa kaksi  yritystä kartalla, ne voidaan ^Byhdistää^N yhdeksi\n"
+"yrityksesksi  valitsemalla tuo sijainti  (jos se on käytettävissä).  Esimer-\n"
+"kiksi alla olevalla kartalla  yritykset ^B~A^N ja ^B~B^N voidaan yhdistää valitsemalla\n"
+"^k~5^N.   Kun tämä tapahtuu,  varakkaampi yritys  ottaa haltuunsa  toisen.  Tässä\n"
+"Yritys ^B~B^N  saattaisi otta haltuunsa  Yrityksen ^B~A^N.  Yritys ^B~A^N  lakkaa olemasta,\n"
+"vaikka se voi ilmaantua kokonaan uutena yrityksenä myöhemmin.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Siirto ^k~5^N yhdistää yritykset ^B~A^N ja ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Kun yritykset  yhdistyvät, pelaajille annetaan  osakkeita hallitsevassa yri-\n"
+"tyksessä suhteessa  summaan, jonka he omistivat  vanhassa yrityksessä.  Myös\n"
+"käteisbonus maksetaan, suhteessa vanhan yrityksen omistusprosenttiin.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Heti kun valitset siirtosi,  siirryt ^BTähtien väliseen osakepörssiin^N.  Täällä\n"
+"voit ostaa osakkeita, myydä  niitä, lainata Kauppapankilta tai maksaa joita-\n"
+"kin velkojasi (jos  sellaisia on).  Huomaa, että jokainen  yritys myy rajoi-\n"
+"tetun määrän  osakkeita -- et voi jatka  ostamista  loputtomiin!   Voit kui-\n"
+"tenkin pyytää  lisää osakkeita myytäväksi.  Sinulla  on paremmat onnistumis-\n"
+"mahdollisuudet, jos omistat laajemman osuuden yrityksestä.\n"
+"\n"
+"Peli  tavallisesti loppuu  ^B~t^N kierroksen  jälkeen.  Voit  kuitenkin lopettaa\n"
+"pelin  aikaisemmin  painamalla ^K<CTRL><C>^N,  kun  sinua pyydetään  valitsemaan\n"
+"siirto. Yksittäiset  pelaajat voivat myös hakea  itsensä konkurssiin milloin\n"
+"tahansa.  Jos  velkasi ovat kyllin  suuria, pankki voi tehdä  tämän sinulle!\n"
+"Jos et päätä peliäsi käytettävissä  olevana aikana, voit tallentaa pelisi ja\n"
+"jatkaa myöhemmin.\n"
+"\n"
+"^BPelin  voittaja^N  on  henkilö,  jolla on  suurin  nettovarallisuus  (yhteensä\n"
+"käteisarvo, osakekanta ja velat).  ^HHyvää onnea^N ja paras pelaaja voittakoon!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Opasteteksti, sivu 7\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Opasteteksti, sivu 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Opasteteksti, sivu 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Opasteteksti, sivu 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Kuinka pelata  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sivu %d / %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Paina <VÄLIYÖNTIÄ> jatkaaksesi ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Paina <VÄLILYÖNTIÄ> jatkaaksesi tai <←> siirtyäksesi edelliselle sivulle ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: merkkijonolla on väärä muoto: ”%s”"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: merkillä on väärä leveys: ”%lc”"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "pääteikkunakoko on liian pieni (%d x %d vaadittu)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Tähtikauppiaat"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: ”%s”"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: virheellinen merkki merkkijonossa: ”%ls”"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Kk"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Ee"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Kyllä"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Ei"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "muisti loppui"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: ”%s”"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: ”%lc”"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: tunnistamaton valitsin ’--%s’\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: virheellinen valitsin -- ’%c’\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..fa3ede4
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,1740 @@
+# French translation of trader.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the trader package.
+# Frédéric Marchal <fmarchal@perso.be>, 2015.
+#
+# Attention: ce fichier ne doit pas contenir d'espace insécable car le
+# programme est compilé avec ncurses qui n'affiche pas correctement
+# l'espace insécable. De plus, il est garanti qu'il n'y aura pas de
+# retour à la ligne forcé. Les ponctuations qui requierent un espace
+# insécable ne seront pas reportées à la ligne suivante.
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-08-27 13:14+0200\n"
+"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
+"Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: opérande invalide « %s »\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: numéro de jeu invalide « %s »\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: opérande surnuméraire « %s »\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders est un simple jeu de commerce interstellaire où l'objectif\n"
+"du jeu est de créer des compagnies, acheter et vendre des parts, emprunter\n"
+"et rembourser de l'argent dans le but de devenir le joueur le plus riche\n"
+"(le gagnant).\n"
+"\n"
+"Ce programme est un logiciel libre distribué selon les termes de la GNU\n"
+"General Public License, version 3 ou suivante.  Vous êtes autorisé à le\n"
+"modifier ou le distribuer sous certaines conditions.  Ce programme ne\n"
+"vient avec AUCUNE GARANTIE, dans les limites permises par la loi; voyez\n"
+"la licence pour plus de détails.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Utilisation: %s [OPTION ...] [JEU]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Jouer à Star Traders, un simple jeu de commerce interstellaire.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Options:\n"
+"  -V, --version        afficher la version et quitter\n"
+"  -h, --help           afficher cette aide et quitter\n"
+"      --no-color       ne pas utiliser de couleurs pour afficher le texte\n"
+"      --max-turn=NUM   effectuer NUM tours\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Si JEU est spécifié et est un nombre entre 1 et 9, charge et continue\n"
+"ce jeu. Si JEU est absent, démarre un nouveau jeu.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Rapportez les bugs à %s <%s>.\n"
+"Rapportez les bugs de traduction à <traduc@traduc.org>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Rapportez les bugs à <%s>\n"
+"Rapportez les bugs de traduction à <traduc@traduc.org>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Rapportez les bugs %s à <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Page d'accueil de Star Traders: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altaïr Télécom"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Bételgeuse SARL"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Transport"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola et associés"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eltanin Export"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Furibundus Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gémeaux et fils"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Hercules S.A."
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1er"
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2ème"
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3ème"
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4ème"
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5ème"
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6ème"
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7ème"
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8ème"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Chargement du jeu %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Premier Joueur  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Le premier joueur est ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Entrez le nombre de joueurs [^{1^}-^{%d^}] ou ^{<C>^} pour continuer le jeu: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Cc"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Entrez le numéro de jeu [^{1^}-^{9^}] ou ^{<CTRL><C>^} pour annuler: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Veuillez entrer votre nom: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Avez-vous besoin des instructions ? [^{O^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Entrez les noms des joueurs  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Joueur %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "L'un des joueurs a-t-il besoin des instructions ? [^{O^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Jeu terminé  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Le jeu est terminé après un tour."
+msgstr[1] "Le jeu est terminé après %d tours."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Valeur totale  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Votre valeur totale était ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Le gagnant est ^{%ls^}\n"
+"qui est en ^[*** BANQUEROUTE ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Le gagnant est ^{%ls^}\n"
+"avec une valeur de ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Gagnant du jeu  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Joueurs"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Valeur totale (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Joueur: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Tour: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Dernier tour ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Portefeuille d'actions  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N Q U E R O U T E   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Aucune compagnie sur la carte"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Compagnies"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Propr.\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Poss.\n"
+"(parts)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Retour\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Prix par\n"
+"part (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Valeur totale:    "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Liquidité:        "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Dette:            "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Taux d'intérêt:   "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Afficher portefeuille d'actions"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Déclarer en banqueroute"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Enregistrer et terminer le jeu"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Quitter le jeu"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Mouvement [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Mouvement ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Déclarer en banqueroute)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Enregistrer et terminer le jeu)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Quitter le jeu)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Êtes-vous sûr ? [^{O^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Enregistrement du jeu %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Tribunal des faillites  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls a été déclaré en banqueroute par la Banque Interstellaire du Commerce."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls s'est déclaré en banqueroute."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Nouvelle compagnie  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Une nouvelle compagnie a été formée !\n"
+"Son nom est ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} vient de fusionner dans ^{%ls^}.\n"
+"Veuillez noter les transactions suivantes:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Fusion de société  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Anciennes actions: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Nouvelles actions: "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Total"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Nouv."
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Anc."
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls a été déclarée en banqueroute par la Banque Interstellaire du Commerce.\n"
+"\n"
+"^{Tous les avoirs ont été saisis pour rembourser les emprunts en cours.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls a été déclarée en banqueroute par la Banque Interstellaire du Commerce.\n"
+"\n"
+"^{La banque a accepté de payer les détenteurs d'actions ^}%.2f%%^{ de la valeur des actions sur chaque action détenue.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Montant payé par action: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Valeur d'action préc.:   "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Banque Interstellaire du Commerce  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Vous avez été obligé d'emprunter %N\n"
+"pour couvrir les pertes dans les actions."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Votre dette atteint le montant de %N!\n"
+"^{La banque a mis sous séquestre ^}%N^{ de vos liquidités.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Bourse Interstellaire  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Actions\n"
+"restantes"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Actions\n"
+"émises"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Afficher la carte de la galaxy"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Visiter la Banque du Commerce"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Quitter la Bourse"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Faites un choix [^[Lettre société^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Limite de crédit: "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Emprunter de l'argent"
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Rembourser dette     "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Quitter la banque    "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Sélection [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Limite de crédit insuffisante  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "La banque ne vous prêtera plus d'argent."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Combien voulez-vous emprunter ? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Pas de dette  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Vous n'avez aucune dette à rembourser."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Pas de liquidité  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Vous n'avez pas de liquidité pour rembourser votre dette !"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Combien voulez-vous rembourser ? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Transaction d'actions chez %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Actions émises:    "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Actions restantes: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Prix par action:   "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Retour:            "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Possessions: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "%% détenu:    "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Liquidités:  "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Acheter actions de la société"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Vendre des actions à la société"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Demander émettre plus d'actions"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Quitter vers la bourse"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Sélection [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Pas d'action disponible  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Plus aucune action à acheter."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Pas assez de liquide  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Vous n'avez pas assez de liquide\n"
+"pour acheter des actions en plus."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Vous pouvez acheter ^{une^} action."
+msgstr[1] "Vous pouvez acheter jusqu'à ^{%'ld^} actions."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Combien d'actions souhaitez-vous acheter ? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Pas d'action  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Vous n'avez aucune action à vendre."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Vous pouvez vendre ^{une^} action."
+msgstr[1] "Vous pouvez vendre jusqu'à ^{%'ld^} actions."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Combien d'actions souhaitez-vous vendre ? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Aucune action émise  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls a refusé\n"
+"d'émettre plus d'actions."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Actions émises  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls a émis\n"
+"^{une^} action en plus."
+msgstr[1] ""
+"%ls a émis\n"
+"^{%'ld^} actions en plus."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: champ manquant à la ligne %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: champ illégal à la ligne %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: champ illégal à la ligne %d: « %s »"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: valeur illégale à la ligne %d: « %s »"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: valeur illégale à la ligne %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: caractère illégal à la ligne %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: la chaîne n'a pas pu être convertie"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Jeu pas trouvé  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Le jeu %d n'a pas été enregistré sur disque."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Jeu pas chargé  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Le jeu %d n'a pas pu être chargé du disque.\n"
+"\n"
+"^{Fichier %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: en-tête manquant dans le fichier du jeu"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: le fichier n'est pas un jeu valable"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: sous-en-tête manquant dans le fichier de jeu"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: enregistré par une version différente de Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: enregistré avec un encodage des caractères incompatible"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: champ illégal ou manquant à la ligne %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Jeu pas enregistré  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Le jeu %d n'a pas pu être enregistré sur le disque.\n"
+"\n"
+"^{Répertoire %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Le jeu %d n'a pas pu être enregistré sur le disque.\n"
+"\n"
+"^{Fichier %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  est  un simple jeu  de commerce interstellaire.  L'objectif du\n"
+"jeu est d'amasser la plus grande fortune possible.  Cet objectif est atteint\n"
+"en créant  des voies de commerce interstellaires,  en les développant  et en\n"
+"achetant des parts  dans les sociétés  qui les contrôles.  Les parts gagnent\n"
+"en valeur  quand les opérations  des sociétés  se développent.  De plus,  le\n"
+"retour  sur  chaque action  (en pourcentage)  change également.  Les joueurs\n"
+"peuvent aussi emprunter à la Banque Interstellaire du Commerce pour financer\n"
+"des achats supplémentaires à la bourse.\n"
+"\n"
+"La  carte  de la galaxie  est  représentée par  une grille  de ^B~x^N x ^B~y^N.  Une\n"
+"section typique pourrait être:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represente un ^Bespace vide^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represente une ^Bétoile^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"L'ordinateur  choisi ^B~m^N  déplacements  au hasard  (numérotés ^k~1^N à ^k~M^N),  et les\n"
+"places sur  la carte.  Pour  sélectionner  une des positions,  pressez cette\n"
+"lettre.  Par exemple, certains déplacements sur la carte pourraient être:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Mouv. ^k~1^N à ^k~5^N montrés.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Choisir une position qui n'est ^Bpas^N près  d'une étoile (telles que ^k~1^N, ^k~3^N ou ^k~5^N)\n"
+"créera  un ^Bavant poste^N,  n'appartenant  à  aucune compagnie.   Ainsi, si  le\n"
+"mouvement ^k~3^N  est sélectionné  sur la  carte ci-dessus,  un ^o ~+ ^N sera  placé à\n"
+"cette position.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Si, à l'inverse, une position  près d'une étoile (ou d'un autre avant poste)\n"
+"est sélectionné,  une ^Bcompagnie^N sera formée  et sa lettre apparaîtra  sur la\n"
+"carte.  Cinq parts vous sont octroyées en récompense  pour la création d'une\n"
+"compagnie.  Jusqu'à ^B~c^N compagnies peuvent être créées de cette manière.\n"
+"\n"
+"Si  une position  à côté  d'une  compagnie  existante  est sélectionnée,  la\n"
+"compagnies étendra ses opérations de un carré.  Cela augmente le coût de ses\n"
+"actions et,  par conséquent,  de votre retour.  Donc, si la carte  est comme\n"
+"montrée ci-dessous, sélectionner ^k~6^N or ^k~8^N augmente les voies de commerce de la\n"
+"compagnies ^B~B^N:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Mouv. ^k~6^N ou ^k~8^N accrois compagnie ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Sélectionner  des positions  près  des étoiles  augmente  la valeur  de  vos\n"
+"actions cinq fois  plus qu'une extension loin d'une  étoile.  Le mouvement ^k~6^N\n"
+"devrait être préféré au mouvement ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Mouv. ^k~6^N préféré à ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Vous pouvez  également étendre  n'importe quelle compagnie  en sélectionnant\n"
+"des positions près des avant  postes.  Ces avants postes seront englobés par\n"
+"la compagnie.   Ainsi, le  mouvement ^k~1^N  aura étendu la  compagnie ^B~C^N  de ^Bdeux^N\n"
+"carrés.  En bonus, les avants postes près des étoiles sont plus précieux: le\n"
+"prix des actions de la  compagnie augmentera d'un montant plus important que\n"
+"celui des avants postes éloignés des étoiles.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Si deux  compagnies sont  séparées sur  la carte par  un carré,  alors elles\n"
+"peuvent  être  ^Bfusionnées^N en  une  seule  compagnie  en sélectionnant  cette\n"
+"position  (si  disponible).   Par  exemple,  sur la  carte  ci-dessous,  les\n"
+"compagnies ^B~A^N et ^B~B^N peuvent  être fusionnées en sélectionnant ^k~5^N.  Lorsque cela\n"
+"se produit, la compagnie avec le plus d'avoirs prend le contrôle de l'autre.\n"
+"Ici,  la compagnie ^B~B^N  pourrait  prendre  le contrôle  de la compagnie ^B~A^N.  La\n"
+"compagnie ^B~A^N  cesse d'exister  bien qu'elle  pourrait réapparaître  comme une\n"
+"toute nouvelle compagnie plus tard dans le jeu.\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Mouv. ^k~5^N fusionne ^B~A^N et ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Quand  des compagnies fusionnent,  les joueurs reçoivent  des parts  dans la\n"
+"compagnie dominante proportionnellement  à la valeur qu'ils possédaient dans\n"
+"l'ancienne compagnie.  En  plus, un bonus en liquide est  payé au prorata de\n"
+"la part dans l'ancienne société.\n"
+"\n"
+"\n"
+"Dès que  vous  sélectionnez  votre  mouvement,  vous entrez  dans  la ^BBourse\n"
+"Interstellaire^N.  Ici, vous pouvez acheter des actions, les vendre, emprunter\n"
+"à  la Banque du Commerce  ou rembourser certaines  de vos dettes (si vous en\n"
+"avez).  Notez que chaque compagnie émet  un nombre limité de parts.  Vous ne\n"
+"pouvez pas  en acheter pour toujours !  Vous pouvez,  en revanche,  demander\n"
+"pour  que  des actions  supplémentaires  soient émises.  Vous avez  plus  de\n"
+"chances de réussite si vous possédez une plus grande part de la compagnie.\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr ""
+"Le jeu  se termine  habituellement après  ^B~t^N tours.  Cependant,  vous pouvez\n"
+"terminer le jeu plus tôt en pressant ^K<CTRL><C>^N lorsqu'il vous est demandé de\n"
+"choisir un mouvement.  Certains  joueurs peuvent aussi se déclarer eux-mêmes\n"
+"en banqueroute à n'importe quel moment.  Si votre dette est assez grande, la\n"
+"banque peut même le faire pour vous !\n"
+"\n"
+"Si  vous ne  terminez  pas  votre jeu  pendant  le temps  que  vous avez  de\n"
+"disponible, vous pouvez enregistrer le jeu et le continuer plus tard.\n"
+"\n"
+"\n"
+"Le ^Bgagnant  du jeu^N  est la personne  avec le  plus grand revenu  net (valeur\n"
+"totale  du liquide,  des actions  et des  dettes).  ^HBonne chance^N  et  que le\n"
+"meilleur gagne !\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Texte d'aide, page 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Texte d'aide, page 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Texte d'aide, page 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Comment jouer  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d sur %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Appuyez <ESPACE> pour continuer ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: la chaîne a un format incorrect: « %s »"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: caractère avec une largeur illégale: « %lc »"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "la taille du terminal est trop petite (%d x %d requis)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: « %s »"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Oo"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Oui"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Non"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "pas assez de mémoire"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: « %s »"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: « %lc »"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: option « %s » est ambiguë; les possibilités sont:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: option « %s » est ambiguë\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: option « --%s » n'accepte pas d'argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: option « %c%s » n'accepte pas d'argument\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: option « --%s » exige un argument\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: option « --%s » non reconnue\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: option « %c%s » non reconnue\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: option invalide -- « %c »\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: option exige un argument -- « %c »\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: option « -W %s » est ambiguë\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: option « -W %s » n'accepte pas d'argument\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: option « -W %s » exige un argument\n"
diff --git a/po/hr.po b/po/hr.po
new file mode 100644
index 0000000..ea219cb
--- /dev/null
+++ b/po/hr.po
@@ -0,0 +1,1725 @@
+# *************************************************************************
+# *                                                                       *
+# *                Croatian Translations for Star Traders                 *
+# *                   Copyright (C) 2012, John Zaitseff                   *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.4-pre2\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2012-04-14 14:31+1000\n"
+"PO-Revision-Date: 2012-04-19 09:21+1000\n"
+"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"Language: hr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: neispravna vrijednost za --max-turn: „%s”\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: neispravan operand „%s”\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: neispravan broj igre „%s”\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: operand viška „%s”\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"„Star Traders” (Međuzvjezdani trgovci) je jednostavna igra međuzvjezadnog\n"
+"trgovanja, gdje je cilj igre stvarati tvrtke, kupovati i prodavati dionice\n"
+"te posuđivati i vraćati novac kako biste postali najbogatiji igrač (pobjednik).\n"
+"\n"
+"Ovaj program je slobodan softver distribuiran pod uvjetima GNU Opće Javne\n"
+"Licence, inačica 3 ili novija.  Slobodno ga smijete uređivati i distribuirati\n"
+"pod određenim uvjetima.  Ovaj program NEMA JAMSTAVA, do krajnje mjere\n"
+"dozvoljene zakonom; pogledajte Licencu za pojedinosti.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Pokušajte „%s --help” za više informacija.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Uporaba: %s [OPCIJA ...] [IGRA]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Opcije:\n"
+"  -V, --version        ispiši informacije o inačici i izađi\n"
+"  -h, --help           prikaži ovu pomoć i izađi\n"
+"      --no-color       ne koristi boje za prikaz teksta\n"
+"      --max-turn=BROJ  postavi broj poteza na BROJ\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Ako je IGRA navedena kao broj između 1 i 9, učitaj i nastavi igranje te\n"
+"igre.  Ako IGRA nije navedena, pokreni novu igru.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Prijavite greške: %s <%s>.\n"
+"Prijavite greške prijevoda: <lokalizacija@linux.hr>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Prijavite greške na <%s>.\n"
+"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Prijavite greške %s na <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Star Traders početna stranica: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair zvjezdani putovi"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse d.o.o."
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella usluge prijevoza"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola brodovi"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani istraživanje"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax express"
+
+#: src/globals.c:53
+msgid "Gemeni Inc"
+msgstr "Gemeni d.d."
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Heraklo i prijatelji"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPRSTU|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnoprstu|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1. "
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2. "
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3. "
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4. "
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5. "
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6. "
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7. "
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8. "
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Učitavam igru %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Prvi igrač  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Prvi igrač na potezu je ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Unesite broj igrača [^{1^}-^{%d^}] ili ^{<N>^} za nastavak igre: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Nn"
+
+#: src/game.c:341 src/move.c:399
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Unesite broj igre [^{1^}-^{9^}] ili ^{<CTRL><C>^} za otkazivanje: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Molim unesite vaše ime: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Trebate li upute? [^{D^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Unesite imena igrača  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Igrač %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Trebaju li ostali igrači upute? [^{D^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Igra gotova  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Igra je gotova nakon %d poteza."
+msgstr[1] "Igra je gotova nakon %d poteza."
+msgstr[2] "Igra je gotova nakon %d poteza."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Ukupna vrijednost  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Vaša ukupna vrijednost je ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Pobjednik je ^{%ls^}\n"
+"koji je ^[*** BANKROTIRAO ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Pobjednik je ^{%ls^}\n"
+"koji ima vrijednost ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Pobjednik igre  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:868
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Igrač"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Ukupna vrijednost (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Igrač: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Potez: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Posljednji potez ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Portfelj dionica  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N K R O T   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Nema tvrtki na mapi"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Tvrtka"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Vlasništvo\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Udio\n"
+"(dionice)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Dobit\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Cijena po\n"
+"dionici (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Ukupna vrijednost:    "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Trenutna gotovina:    "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Trenutni dug:         "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Kamatna stopa:        "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:243 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Prikaži portfelj dionica"
+
+#: src/move.c:245
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Objavi bankrot"
+
+#: src/move.c:247
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Spremi i završi igru"
+
+#: src/move.c:249
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Izađi iz igre"
+
+#. TRANSLATORS: The maximum column width is 38 characters,
+#. including the trailing space.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:258
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Odaberite potez [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:295
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Potez ^{%lc^}"
+
+#: src/move.c:316
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Objavi bankrot)"
+
+#: src/move.c:325
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Spremi i završi igru)"
+
+#: src/move.c:346
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Izađi iz igre)"
+
+#: src/move.c:361
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Jeste li sigurni? [^{D^}/^{N^}] "
+
+#: src/move.c:378 src/move.c:456
+#, c-format
+msgid "Saving game %d... "
+msgstr "Spremam igru %d... "
+
+#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Stečajni upravitelj  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:688
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "Međuzvjezdana trgovačka banka je proglasila bankrot igrača %ls."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:696
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls je objavio bankrot."
+
+#: src/move.c:764
+#, c-format
+msgid "  New Company  "
+msgstr "  Nova tvrtka  "
+
+#: src/move.c:765
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Osnovana je nova tvrtka!\n"
+"Njezino ime je ^{%ls^}."
+
+#: src/move.c:824
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"Tvrtku ^{%ls^} je upravo preuzela tvrtka ^{%ls^}.\n"
+"Molim obratite pažnju na sljedeće transakcije:\n"
+
+#: src/move.c:830
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Udruživanje tvrtki  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:850
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Stare dionice: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:861
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Nove dionice:  "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:875
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:880
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Ukupno"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:887
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Nove"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:893
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Stare"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1054
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"Međuzvjezdana trgovačka banka je proglasila bankrot tvrtke %ls.\n"
+"\n"
+"^{Sva imovina je oduzeta zbog otplate tekućih pozajmica.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1078
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"Međuzvjezdana trgovačka banka je proglasila bankrot tvrtke %ls.\n"
+"\n"
+"^{Banka je pristala isplatiti vlasnicima dionica ^}%.2f%%^{ vrijednosti svake dionice.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1106
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Isplata po dionici:       "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1114
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Stara vrijednost dionice: "
+
+#: src/move.c:1197 src/move.c:1232 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Međuzvjezdana trgovačka banka  "
+
+#: src/move.c:1199
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Prisiljeni ste posuditi %N\n"
+"za pokrivanje gubitaka dionica tvrtke."
+
+#: src/move.c:1234
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Vaš dug se povećao na %N!\n"
+"^{Banka je zaplijenila ^}%N^{ vaše gotovine.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Međuzvjezdana burza  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Preostalo\n"
+"dionica"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Izdano\n"
+"dionica"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Prikaži mapu galaksije"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Posjetite trgovačku banku"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Izađite iz Burze"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Unesite odabir [^[Slovo tvrtke^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kreditno ograničenje: "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Posudite novac  "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Otplatite dug   "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Izađite iz banke"
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Unesite odabir [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Nedovoljno kreditno ograničenje  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Banka vam više neće posuđivati novac."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Koliko želite posuditi? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Nema duga  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Nemate dug za otplatu."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Nema gotovine  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Nemate gotovinu kojom možete otplatiti dug!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Koliko želite otplatiti? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Trgovanje dionicama u %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Izdano dionica:    "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Preostalo dionica: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Cijena dionice:    "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Dobit:             "
+
+#. TRANSLATORS: "Current holdings" is the number of shares the
+#. current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Trenutni udjeli: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:633
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Vlasništvo (%%):  "
+
+#: src/exch.c:638
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Gotovina:        "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:651
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Kupite dionicu od tvrtke"
+
+#: src/exch.c:653
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Prodajte dionicu natrag tvrtci"
+
+#: src/exch.c:655
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Zatražite izdavanje dionica"
+
+#: src/exch.c:657
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Izađite u Burzu"
+
+#: src/exch.c:660
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Unesite odabir [^{1^}-^{4^}]: "
+
+#: src/exch.c:716
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Nema dostupnih dionica  "
+
+#: src/exch.c:717
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Nema više dionica dostupnih za kupovinu."
+
+#: src/exch.c:721
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Nedovoljno gotovine  "
+
+#: src/exch.c:722
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Nemate dovoljno gotovine\n"
+"za kupovinu dodatnih dionica."
+
+#: src/exch.c:733
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Možete kupiti ^{%'ld^} dionicu."
+msgstr[1] "Možete kupiti ^{%'ld^} dionice."
+msgstr[2] "Možete kupiti ^{%'ld^} dionica."
+
+#: src/exch.c:739
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Koliko dionica želite kupiti? "
+
+#: src/exch.c:760
+#, c-format
+msgid "  No Shares  "
+msgstr "  Nema dionica  "
+
+#: src/exch.c:761
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Nemate nijednu dionicu za prodaju."
+
+#: src/exch.c:768
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Možete prodati ^{%'ld^} dionicu."
+msgstr[1] "Možete prodati ^{%'ld^} dionice."
+msgstr[2] "Možete prodati ^{%'ld^} dionica."
+
+#: src/exch.c:774
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Koliko dionica želite prodati? "
+
+#: src/exch.c:802
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Nema izdanih dionica  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:804
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"Tvrtka %ls je odbila\n"
+"izdati nove dionice."
+
+#: src/exch.c:809
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Izdano dionica  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:811
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"Tvrtka %ls je izdala\n"
+"^{%'ld^} novu dionicu."
+msgstr[1] ""
+"Tvrtka %ls je izdala\n"
+"^{%'ld^} nove dionice."
+msgstr[2] ""
+"Tvrtka %ls je izdala\n"
+"^{%'ld^} novih dionica."
+
+#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: nedostaje polje u retku %d"
+
+#: src/fileio.c:60
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: nedozvoljeno polje u retku %d: „%s”"
+
+#: src/fileio.c:64
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: nedozvoljena vrijednost u retku %d: „%s”"
+
+#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: nedozvoljena vrijednost u retku %d"
+
+#: src/fileio.c:103
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: nedozvoljeni znak u retku %d"
+
+#: src/fileio.c:184
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: ne mogu pretvoriti niz znakova"
+
+#: src/fileio.c:255
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Igra nije pronađena  "
+
+#: src/fileio.c:256
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Igra %d nije spremljena na disk."
+
+#: src/fileio.c:263
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Igra nije učitana  "
+
+#: src/fileio.c:264
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Igru %d nije moguće učitati s diska.\n"
+"\n"
+"^{Datoteka %s: %s^}"
+
+#: src/fileio.c:316
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: nedostaje zaglavlje u datoteci igre"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: nije ispravna datoteka igre"
+
+#: src/fileio.c:322 src/fileio.c:329
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: nedostaje podzaglavlje u datoteci igre"
+
+#: src/fileio.c:325
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: spremljena različitom inačicom igre Star Traders"
+
+#: src/fileio.c:332
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: spremljena s nekompatibilnim kodiranjem znakova"
+
+#: src/fileio.c:340
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: nedozvoljeno ili nedostaje polje u retku %d"
+
+#: src/fileio.c:384
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: nedozvoljeno polje u retku %d"
+
+#: src/fileio.c:466 src/fileio.c:487
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Igra nije spremljena  "
+
+#: src/fileio.c:467
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Igru %d nije moguće spremiti na disk.\n"
+"\n"
+"^{Direktorij %s: %s^}"
+
+#: src/fileio.c:488
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Igru %d nije moguće spremiti na disk.\n"
+"\n"
+"^{Datoteka %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^B„Star Traders”^N  (Međuzvjezdani trgovci)  je jednostavna  igra međuzvjezdanog\n"
+"trgovanja.  Cilj igre  je skupiti što je moguće  veće bogatstvo.  Ovo činite\n"
+"stvaranjem  međuzvjezdanih  trgovačkih   putova,  njihovim  proširivanjem  i\n"
+"kupovanjem udjela  u tvrtkama koje upravljaju njima.   Vrijednost dionica se\n"
+"povećava  širenjem  poslovanja  tvrtki,  kao  i njihova  dobit  (izražena  u\n"
+"postocima).  Igrači također mogu posuđivati novce od Međuzvjezdane trgovačke\n"
+"banke za financiranje kupovanja dodatnih dionica na Burzi.\n"
+"\n"
+"Karta  galaksije  prikazana  je mrežom  ^B~x^N x ^B~y^N.  Uobičajeni  prikaz  dijela\n"
+"galaksije može biti:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N označava ^Bprazan prostor^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N označava ^Bzvijezdu^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Računalo slučajno  bira  ^B~m^N poteza  (označenih s ^k~1^N do ^k~M^N)  i postavlja  ih na\n"
+"kartu.   Za odabir  jednog od  označenih položaja  pritisnite  to slovo.  Na\n"
+"primjer, neki potezi na karti mogu biti:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Prikazani su potezi ^k~1^N do ^k~5^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Odabir  položaja koji  ^Bnije^N  uz zvijezdu  (npr. položaji  ^k~1^N,  ^k~3^N  ili  ^k~5^N)  će\n"
+"postaviti ^Bizvidnicu^N, koja ne pripada nijednoj tvrtci.  Tako će odabir poteza\n"
+"^k~3^N na gornjoj karti postaviti ^o ~+ ^N na taj položaj.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"S  druge  strane,  ako  je   odabran  položaj  pokraj  zvijezde  (ili  druge\n"
+"izvidnice), osnovat će  se ^Btvrtka^N i njezino će se  početno slovo pojaviti na\n"
+"karti.   Kao nagradu  za  osnivanje  tvrtke dobit  ćete  prvih pet  njezinih\n"
+"dionica.  Na ovaj način možete osnovati ^B~c^N tvrtki.\n"
+"\n"
+"Ako  je odabran  položaj pokraj  postojeće  tvrtke, ona  će proširiti  svoje\n"
+"poslovanje  za jedno  polje.  Ovo  povećava cijenu  njezinih dionica  i vaše\n"
+"prihode.  Na primjer, ako je mapa kao što je prikazana dolje, biranjem ^k~6^N ili\n"
+"^k~8^N će se povećati trgovački put tvrtke ^B~B^N:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Potez ^k~6^N ili ^k~8^N povećava tvrtku ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Odabir položaja  pokraj zvijezde povećava  vrijednost vaših dionica  oko pet\n"
+"puta više nego  širenje u polje koje nije pokraj zvijezde.   Zato se potez ^k~6^N\n"
+"preferira u odnosu na potez ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Potez ^k~6^N se preferira u odnosu na ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Također možete  proširiti tvrtku biranjem položaja  pokraj izvidnica.  Takve\n"
+"izvidnice će se spojiti u tvrtku.  Tako će potez ^k~1^N proširiti tvrtku ^B~C^N za ^Bdva^N\n"
+"polja.  Kao  bonus, izvidnice pokraj zvijezda su još vrijednije:  vrijednost\n"
+"dionice  tvrtke  će se više  povećati nego  u slučaju  izvidnica koje  se ne\n"
+"nalaze uz zvijezde.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Ako su dvije tvrtke na karti  odvojene samo jednim poljem, mogu se ^Bspojiti^N u\n"
+"jednu tvrtku odabirom tog položaja (ako je dostupan).  Na primjer, na donjoj\n"
+"karti,  tvrtke ^B~A^N i ^B~B^N  se mogu spojiti odabirom ^k~5^N.  Kad se  to dogodi, tvrtka\n"
+"koja ima veću vrijednost preuzima  tvrtku manje vrijednosti.  Ovdje tvrtka ^B~B^N\n"
+"može preuzeti  tvrtku ^B~A^N.  Tvrtka ^B~A^N prestaje postojati,  iako se poslije može\n"
+"pojaviti kao potpuno nova tvrtka.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Potez ^k~5^N spaja tvrtke ^B~A^N i ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Nakon  spajanja  tvrtki,  igrači  dobivaju broj  dionica  dominantne  tvrtke\n"
+"proporcionalan  udjelu u  staroj  tvrtci.  Također  se isplaćuje  gotovinski\n"
+"bonus proporcionalan postotku udjela u staroj tvrtci.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Kada  odaberete svoj  potez, ulazite  u  ^BMeđuzvjezdanu burzu^N.   Ovdje možete\n"
+"kupovati  dionice,  prodavati ih, posuđivati  novce od  Trgovačke  banke ili\n"
+"otplatiti dio vašeg duga  (ako postoji).  Primijetite da svaka tvrtka izdaje\n"
+"ograničen  broj dionica  --  ne možete  kupovati  cijelo vrijeme!   Međutim,\n"
+"možete tražiti od  tvrtke izdavanje novih dionica.  Ako  imate veću količinu\n"
+"udjela u tvrtci, veće su vam šanse za uspjeh.\n"
+"\n"
+"Igra uobičajeno  završava nakon ^B~t^N poteza.  Međutim,  možete završiti ranije\n"
+"pritiskom  ^K<CTRL><C>^N  umjesto odabira poteza.  Također pojedini  igrači mogu\n"
+"objaviti bankrot u svakom trenutku.  Ako  je vaš dug prevelik, Banka to može\n"
+"učiniti  umjesto vas!   Ako ste  prezauzeti za  dovršavanje igre,  možete je\n"
+"spremiti i nastaviti kasnije.\n"
+"\n"
+"\n"
+"^BPobjednik  igre^N  je  osoba   koja  ima  najveću  ukupnu  vrijednost  (ukupna\n"
+"vrijednost gotovine, dionica i duga).  ^HSretno^N i neka najbolji pobijedi!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Tekst pomoći, stranica 7\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Tekst pomoći, stranica 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Tekst pomoći, stranica 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Tekst pomoći, stranica 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Upute za igranje  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stranica %d od %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and
+#. <BACKSPACE> is not essential: you can use <DEL>,
+#. <PAGE-UP>, <UP>, <LEFT> or <BACK-TAB> instead of
+#. <BACKSPACE>, and almost any other key instead of
+#. <SPACE> (other than <ESC>, <CANCEL>, <EXIT>, <CTRL><C>,
+#. <CTRL><G> or <CTRL><\>).
+#: src/help.c:494
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ili <BACKSPACE> za povratak ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: niz znakova ima nepravilan oblik: „%s”"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: znak ima nedozvoljenu širinu: „%lc”"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "veličina terminala je premalena (potrebno je %d x %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: „%s”"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: nedozvoljen znak u nizu: „%ls”"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Dd"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Da"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Ne"
+
+#: src/utils.c:199 src/utils.c:220
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:225
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:238
+#, c-format
+msgid "out of memory"
+msgstr "nema dovoljno memorije"
+
+#: src/utils.c:571
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: „%s”"
+
+#: src/utils.c:611
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:616
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: „%lc”"
+
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: opcija „%s” je višeznačna; mogućnosti:"
+
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: opcija „--%s” ne dozvoljava argument\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: opcija „%c%s” ne dozvoljava argument\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: opcija „--%s” zahtijeva argument\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: neprepoznata opcija „--%s”\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: neprepoznata opcija „%c%s”\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: neispravna opcija -- „%c”\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: opcija zahtijeva argument -- „%c”\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: opcija „-W %s” je višeznačna\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: opcija „-W %s” ne dozvoljava argument\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opcija „-W %s” zahtijeva argument\n"
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 0000000..509d39c
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,1729 @@
+# *************************************************************************
+# *                                                                       *
+# *                Hungarian Translations for Star Traders                *
+# *                 Copyright (C) 2012-14, John Zaitseff                  *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#
+#   Balázs Úr <urbalazs@gmail.com>, 2014, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-08-30 09:46+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: érvénytelen érték a --max-turn kapcsolóhoz: „%s”\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: érvénytelen operandus: „%s”\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: érvénytelen játékszám: „%s”\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: extra operandus: „%s”\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"A Star Traders egy egyszerű csillagközi kereskedelmi játék, ahol a játék\n"
+"célja társaságok létrehozása, részvények vásárlása és eladása, pénz\n"
+"kölcsönkérése és visszafizetése azért, hogy a leggazdagabb játékossá\n"
+"(győztessé) váljon.\n"
+"\n"
+"Ez a program szabad szoftver, amely a GNU General Public License 3-as\n"
+"vagy későbbi változata szerint terjesztett. Bizonyos feltételek mellett\n"
+"terjeszthető, illetve módosítható. Ehhez a program NINCS GARANCIA, a\n"
+"törvény által megengedett mértékben; a részletekért tekintse meg a\n"
+"licencet.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: További információkért próbálja a(z) „%s --help” parancsot.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Használat: %s [KAPCSOLÓ …] [JÁTÉK]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Kapcsolók:\n"
+"  -V, --version        verzió információk kiírása és kilépés\n"
+"  -h, --help           ezen súgószöveg kiírása és kilépés\n"
+"      --no-color       nem használjon színeket a szöveg megjelenítéséhez\n"
+"      --max-turn=SZÁM  körök számának beállítása SZÁMRA\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Ha a JÁTÉK 1 és 9 közötti számként van megadva, akkor betölti és folytatja\n"
+"azt a játékot. Ha a JÁTÉK nincs megadva, akkor egy új játékot indít.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr "A hibák itt jelenthetők: %s <%s>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr "A hibák itt jelenthetők: <%s>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "A %s hibái ezen a címen jelenthetők: <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "A Star Traders honlapja: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair Starways"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse Kft."
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Freight Társaság"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Hajósai"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Felfedezők"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini Zrt."
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Herkules és Társa"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "%d. játék betöltése... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Első játékos  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Az első játékos, aki következik: ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Adja meg a játékosok számát [^{1^}-^{%d^}] vagy ^{<F>^} egy játék folytatásához: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Ff"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Adja meg a játék számát [^{1^}-^{9^}] vagy ^{<CTRL><C>^} a megszakításhoz: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Kérem adja meg a nevét: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Szüksége van utasításokra? [^{I^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Játékosok nevének megadása  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "%d. játékos: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Szüksége van valamelyik játékosnak utasításokra? [^{I^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Vége a játéknak  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "A játék egy kör után ért véget."
+msgstr[1] "A játék %d kör után ért véget."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Összérték  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Az összértéke ^{%N^} volt."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"A győztes ^{%ls^},\n"
+"aki ^[*** BECSŐDÖLT ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"A győztes ^{%ls^},\n"
+"^{%N^} értékkel."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  A játék győztese  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Játékos"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Összérték (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Játékos: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Kör: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Utolsó kör ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Részvényportfólió  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B E C S Ő D Ö L T   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Nincsenek társaságok a térképen"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Társaság"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Tulajdonos\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Vagyon\n"
+"(részvény)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Haszon\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Részvényenkénti\n"
+"ár (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Összérték:          "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Jelenlegi készpénz: "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Jelenlegi adósság:  "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Kamatláb:           "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Részvényportfólió megjelenítése"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Csőd jelentése"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Mentés és a játék befejezése"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Kilépés a játékból"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Lépés kiválasztása [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Lépés ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Csőd jelentése)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Mentés és a játék befejezése)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Kilépés a játékból)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Biztos benne? [^{I^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "%d. játék mentése... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Csődbíróság  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls - fizetésképtelenné nyilvánította a Csillagközi Kereskedelmi Bank."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls fizetésképtelenné lett nyilvánítva."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Új társaság  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Egy új társaság alakult!\n"
+"A neve: ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} épp most egyesült a következővel: ^{%ls^}.\n"
+"Vegye figyelembe a következő tranzakciókat:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Társaság egyesítő  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Régi részvény: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Új részvény:   "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bónusz (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Összesen"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Új"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Régi"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls - fizetésképtelenné nyilvánította a Csillagközi Kereskedelmi Bank.\n"
+"\n"
+"^{Minden eszközt lefoglaltak a fennálló hitelek visszafizetésére.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls - fizetésképtelenné nyilvánította a Csillagközi Kereskedelmi Bank.\n"
+"\n"
+"^{A Bank beleegyezett, hogy kifizeti a részvényeseknek a részvény\n"
+"értékének ^}%.2f%%^{-át minden birtokolt részvényre.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Részvényenkénti kifizetés: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Régi részvényérték:        "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Csillagközi Kereskedelmi Bank  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Kénytelen volt %N kölcsönt felvenni a\n"
+"társaságok részvényei utáni veszteségek fedezésére."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Az adóssága elérte a következő mértéket: %N!\n"
+"^{A Bank lefoglalt ^}%N^{ készpénzt.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Csillagközi Értéktőzsde  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Maradék\n"
+"részvények"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Kibocsátott\n"
+"részvények"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Galaxistérkép megjelenítése"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} A Kereskedelmi Bank felkeresése"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Kilépés az értéktőzsdéről"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Kijelölés megadása [^[Társaság betűje^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Hitelkeret:         "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Pénz kölcsönkérése     "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Adósság visszafizetése "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Kilépés a Bankból      "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Kijelölés megadása [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Nincs elegendő hitelkeret  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "A Bank nem fog több pénzt kölcsönadni."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Mennyit szeretne kölcsönkérni? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Nincs adósság  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Nincs visszafizetendő adóssága."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Nincs készpénz  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Nincs készpénze, amellyel az adósságát visszafizethetné!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Mennyit szeretne visszafizetni? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Részvény tranzakciók a következőben: %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Kibocsátott részvény: "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Maradék részvények:   "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Részvényenkénti ár:   "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Haszon:               "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Jelenlegi vagyon: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Birtokolt arány:  "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Jelenlegi pénz:   "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Részvény vétele a társaságtól"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Részvény eladása a társaságnak"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} További részvények kibocsátása"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Kilépés az értéktőzsdére"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Kijelölés megadása [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Nincsenek elérhető részvények  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Nincsenek elérhető részvények a vásárláshoz."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Nincs elég készpénz  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Nincs elegendő készpénze további\n"
+"részvények vásárlásához."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "^{Egy^} részvényt vehet."
+msgstr[1] "Legfeljebb ^{%'ld^} részvényt vehet."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Hány részvényt szeretne vásárolni? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Nincsenek részvények  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Nincsen egyetlen eladható részvénye sem."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "^{Egy^} részvényt adhat el."
+msgstr[1] "Legfeljebb ^{%'ld^} részvényt adhat el."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Hány részvényt szeretne eladni? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Nincsenek kibocsátott részvények  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls visszautasította\n"
+"a további részvények kibocsátását."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Kibocsátott részvények  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls kibocsátott\n"
+"még ^{egy^} részvényt."
+msgstr[1] ""
+"%ls kibocsátott\n"
+"még ^{%'ld^} részvényt."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: hiányzó mező a(z) %d. sorban"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: szabálytalan mező a(z) %d. sorban"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: szabálytalan mező a(z) %d. sorban: „%s”"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: szabálytalan érték a(z) %d. sorban: „%s”"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: szabálytalan érték a(z) %d. sorban"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: szabálytalan karakterek a(z) %d. sorban"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: nem sikerült átalakítani a szöveget"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Játék nem található  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "A(z) %d. játék nem lett elmentve a lemezre."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Játék nincs betöltve  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"A(z) %d. játékot nem sikerült betölteni a lemezről.\n"
+"\n"
+"^{Fájl %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: hiányzó fejléc a játék fájlban"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: nem érvényes játék fájl"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: hiányzó alfejléc a játék fájlban"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: a Star Traders eltérő verziójával lett elmentve"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: egy nem kompatibilis karakterkódolással lett elmentve"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: szabálytalan vagy hiányzó mező a(z) %d. sorban"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  A játék nincs elmentve  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"A(z) %d. játékot nem sikerült elmenteni a lemezre.\n"
+"\n"
+"^{Könyvtár %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"A(z) %d. játékot nem sikerült elmenteni a lemezre.\n"
+"\n"
+"^{Fájl %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"A ^BStar Traders^N egyszerű  csillagközi  kereskedelmi  játék.  A játék  célja a\n"
+"lehető legnagyobb mennyiségű vagyon felhalmozása.  Ezt csillagközi  hajózási\n"
+"útvonalak létrehozásával,  azok bővítésével és az azokat irányító társaságok\n"
+"részvényeinek  megvásárlásával  lehet megtenni.  A részvényeket a társaságok\n"
+"tevékenységeinek  bővülése alapján értékelik fel.  Ezenkívül minden részvény\n"
+"hozama  (százalékosan)  is változik.  A játékosok a Csillagközi Kereskedelmi\n"
+"Banktól  is  kérhetnek  kölcsön  az  Értéktőzsdén  való  további  vásárlások\n"
+"finanszírozásához.\n"
+"\n"
+"A galaxis térképét egy ^B~x^N x ^B~y^N méretű rács ábrázolja.  Egy tipikus szelvénye\n"
+"az alábbi lehet:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N az ^Büres teret^N jelenti,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N egy ^Bcsillagot^N ábrázol.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"A számítógép ^B~m^N véletlenszerű lépést választ ki (^k~1^N és ^k~M^N között címkézve), és\n"
+"elhelyezi ezeket a térképen. A kiemelt pozíciók valamelyikének kiválasztásá-\n"
+"hoz nyomja meg az adott betűt.  Például néhány lehetséges  lépés a következő\n"
+"lehet a térképen:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Megjelenített lépések ^k~1^N és ^k~5^N között.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"Egy olyan pozíció kiválasztásával, amely  ^Bnem^N  egy csillag mellett van (mint\n"
+"például ^k~1^N, ^k~3^N vagy ^k~5^N), egy ^Belőretolt állást^N fog létesíteni,  amely nem tarto-\n"
+"zik egyetlen társasághoz sem. Így ha a ^k~3^N lépést választják a fenti térképen,\n"
+"akkor egy ^o ~+ ^N lesz elhelyezve arra a pozícióra.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Másrészről ha egy csillag (vagy egy másik előretolt állás) melletti pozíciót\n"
+"választ ki,  akkor egy ^Btársaság^N fog megalakulni,  és annak betűje megjelenik\n"
+"a térképen.  A társaság létrehozásának jutalmául átruházzák  Önre az első öt\n"
+"részvényt. Legfeljebb ^B~c^N társaságot lehet ilyen módon létrehozni.\n"
+"\n"
+"Ha egy meglévő  társaság melletti  pozíciót választ ki,  akkor a társaság ki\n"
+"fogja terjeszteni a működését egy egységgel.  Ez növeli a részvényei árát és\n"
+"ennél fogva a hasznot. Így a lent megjelenített térképen az ^k~6^N vagy a ^k~8^N kivá-\n"
+"lasztása növeli ^B~B^N társaság hajózási útvonalát:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Az ^k~6^N vagy ^k~8^N lépés növeli a ^B~B^N társaságot.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"A csillagok melletti pozíciók kiválasztása mintegy  ötször akkorára növeli a\n"
+"részvények értékét, mint amennyire egy nem csillag melletti kiterjesztés nö-\n"
+"velné. Így az ^k~6^N lépést előnyben kell részesíteni a ^k~8^N lépéssel szemben.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Az ^k~6^N lépés előnyben részesített ^k~8^N ellen.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Az előretolt  állások  melletti  pozíciók kiválasztásával  is lehet bővíteni\n"
+"bármely  társaságot.  Az ilyen előretolt  állásokat be fogja  kebelezni az a\n"
+"társaság.  Így az  ^k~1^N  lépés  ^Bkét^N  egységgel fogja bővíteni a  ^B~C^N  társaságot.\n"
+"Bónuszként a  csillagok melletti  előretolt állások  sokkal  értékesebbek: a\n"
+"társaság részvényárfolyama nagyobb mértékben fog növekedni, mint a nem csil-\n"
+"lagok melletti előretolt állásoknál nőne.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Ha a térképen két társaságot csak egyetlen egység választ el, akkor egy tár-\n"
+"sasággá  ^Begyesíthetők^N  annak a pozíciónak a  kiválasztásával  (ha elérhető).\n"
+"Például a lenti térképen az  ^B~A^N és a ^B~B^N társaságok egyesíthetők az ^k~5^N kiválasz-\n"
+"tásával.  Ha ez megtörtént, akkor a nagyobb eszközértékkel rendelkező társa-\n"
+"ság átveszi a másikat. Itt a ^B~B^N társaság veheti át az ^B~A^N társaságot. Az ^B~A^N tár-\n"
+"saság megszűnik létezni, habár újra megjelenhet egy teljesen új társaságként\n"
+"egy későbbi szakaszban.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N      Az ^k~5^N lépés egyesíti az ^B~A^N és a ^B~B^N társaságot.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"\n"
+"Ha a társaságok egyesülnek, a játékosok a túlsúlyban lévő társaságban a régi\n"
+"társaságban birtokolt mennyiséggel  arányosan kapnak részvényeket.  Készpénz\n"
+"bónuszt is fizetnek a régi társaságban birtokolt százalék arányában.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Miután kiválasztotta a lépését,  beléphet a  ^BCsillagközi Értéktőzsdére^N.  Itt\n"
+"részvényeket vásárolhat, eladhatja azokat, kölcsönt vehet fel a Kereskedelmi\n"
+"Banktól  vagy  visszafizetheti az  adóssága egy részét  (adott esetben).  Ne\n"
+"feledje,  hogy minden társaság korlátozott mennyiségű részvényt bocsát ki --\n"
+"nem fogja tudni örökké megvenni! Azonban kérheti további részvények kibocsá-\n"
+"tását. Jobb esélye van a sikerre, ha a társaság nagyobb arányát birtokolja.\n"
+"\n"
+"A játék általában  ^B~t^N  kör után ér véget. Ugyanakkor korábban is befejezheti\n"
+"a játékot a  ^K<CTRL><C>^N  megnyomásával, amikor egy lépés kiválasztását kérik.\n"
+"Az egyes játékosok bármikor fizetésképtelenné is nyilváníthatják magukat. Ha\n"
+"elég nagy adóssága van, ezt a Bank is megteheti Ön helyett! Ha nem fejezi be\n"
+"a játékot az elérhető időn belül, el is mentheti azt és később folytathatja.\n"
+"\n"
+"\n"
+"A ^Bjáték nyertese^N  a legnagyobb nettó vagyonnal rendelkező személy (készpénz,\n"
+"részvény és adósság együttes értéke). ^HSok sikert^N, győzzön a legjobb játékos!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Súgószöveg, 7. oldal\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Súgószöveg, 8. oldal\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Súgószöveg, 9. oldal\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Súgószöveg, 10. oldal\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  A játék menete  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d / %d oldal"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz vagy <BACKSPACE>-t az előző oldalhoz] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: a szövegnek helytelen formátuma van: „%s”"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: a karakternek szabálytalan szélessége van: „%lc”"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "a terminál mérete túl kicsi (%d x %d szükséges)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: „%s”"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: érvénytelen karakter a szövegben: „%ls”"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Ii"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Igen"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Nem"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "nincs elég memória"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: „%s”"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: „%lc”"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ismeretlen „--%s” kapcsoló\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: érvénytelen kapcsoló -- „%c”\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..da4847f
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,1730 @@
+# *************************************************************************
+# *                                                                       *
+# *            Norwegian Bokmål Translations for Star Traders             *
+# *                   Copyright (C) 2012, John Zaitseff                   *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Johnny A. Solbu <johnny@solbu.net>, 2012-2015
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-08-27 01:56+0100\n"
+"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
+"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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: Poedit 1.6.9\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: ugyldig verdi for --max-turn: «%s»\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: ugyldig operand «%s»\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: ugyldig spillnummer «%s»\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: ekstra operand «%s»\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Opphavsrett (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders er et enkelt spill med interstellar handel, der målet med\n"
+"spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale\n"
+"tilbake penger for å bli den rikeste spilleren (vinneren).\n"
+"\n"
+"Dette programmet er Fri programvare som distribueres under vilkårene\n"
+"i GNU General Public License, versjon 3 eller nyere. Du er velkommen\n"
+"til å endre og / eller distribuere det under visse betingelser. Dette\n"
+"programmet har INGEN GARANTI i den grad loven tillater, se lisens for\n"
+"detaljer.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Prøv «%s --help» for mer informasjon.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Bruksmåte: %s [VALG ...] [SPILL]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Spill Star Traders, et enkelt spill med interstellar handel.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Valg:\n"
+"  -V, --version        vis versjonsinformasjon og avslutt\n"
+"  -h, --help           vis denne hjelpen og avslutt\n"
+"      --no-color       ikke bruk farger for visning av tekst\n"
+"      --max-turn=NUM   sette antall runder til NUM\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Hvis SPILL er angitt som et tall mellom 1 og 9, last og fortsette med\n"
+"å spille det spillet. Hvis SPILL ikke er angitt, start nytt spill.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Rapporter feil, på engelsk, til %s <%s>.\n"
+"Oversettelsesfeil kan rapporteres til <i18n-nb@lister.ping.uio.no>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Rapporter feil, på engelsk, til <%s>.\n"
+"Oversettelsesfeil kan rapporteres til <i18n-nb@lister.ping.uio.no>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Rapporter %s feil til <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Star Traders hjemmeside: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair Starways"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse A/S"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Freight A/S"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Shippers"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Expediters"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini A/S"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Hercules og Co"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Laster spill %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Første spiller  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Spilleren som begynner er ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Angi antall spillere [^{1^}-^{%d^}] eller ^{<F>^} for å fortsette et spill: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Ff"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{<CTRL><C>^} for å avbryte: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Skriv inn navnet ditt: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Trenger du noen instruksjoner? [^{J^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Angi Spillernavn  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Spiller %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Trenger noen av deltakere instruksjoner? [^{J^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Spillet er slutt  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Spillet er over etter en runde."
+msgstr[1] "Spillet er over etter %d runder."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Total verdi  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Din samlede verdi var ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Vinneren er ^{%ls^}\n"
+"som er ^[*** KONKURS ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Vinneren er ^{%ls^}\n"
+"med en verdi på ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Vinner av spillet  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Spiller"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Total verdi (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Spiller: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Runde: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Forrige runde ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Aksjeportefølje  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   K O N K U R S   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Ingen bedrifter på kartet"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Firma"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Eierskap\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Beholdning\n"
+"(aksjer)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Utbytte\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Pris per\n"
+"aksje (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Total verdi:         "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Nåværende kontanter: "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Eksisterende gjeld:  "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Rentesats:           "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Vis aksjeportefølje"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Gå konkurs"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Lagre og avslutt spillet"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Avslutt spillet"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Velg trekk [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Trekk ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Gå konkurs)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Lagre og avslutt spillet)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Avslutt spillet)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Er du sikker? [^{J^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Lagrer spill %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Skifteretten  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls er erklært konkurs av Interstellar Handelsbank."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls har gått konkurs."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Nytt firma  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Et nytt firma er opprettet!\n"
+"Navnet er ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} har nettopp fusjonert med ^{%ls^}.\n"
+"Vær oppmerksom på følgende transaksjoner:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Fusjon  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Gamle aksjer: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Nye aksjer:   "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Totalt"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Ny"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Gammel"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls er erklært konkurs av Interstellar Handelsbank.\n"
+"\n"
+"^{Alle eiendeler er overtatt for å betale tilbake utestående lån.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls er erklært konkurs av Interstellar Handelsbank.\n"
+"\n"
+"^{Banken har avtalt å betale aksjonærer ^}%.2f%%^{ av aksjeverdien på hver aksje.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Betalt beløp per aksje: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Gammel aksjeverdi:      "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Interstellar Handelsbank  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Du ble tvunget til å låne %N\n"
+"til å dekke tap fra selskapets aksjer."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Gjelden din er kommet opp i %N!\n"
+"^{Banken har beslaglagt ^}%N^{ fra kontantbeholdningen.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Interstellar Børs  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Aksjer\n"
+"igjen"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Aksjer\n"
+"utstedt"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Vis galaksekart"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Besøke Handelsbanken"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Forlat børsen"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Angi valg [^[Firmabrev^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kredittgrense:       "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Låne penger    "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Nedbetal gjeld "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Gå ut av banken"
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Angi valg [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Utilstrekkelig kredittgrense  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Banken vil ikke låne deg mer penger."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Hvor mye ønsker du å låne? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Ingen gjeld  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Du har ingen gjeld å betale."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Ingen kontanter  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Du har ingen penger å nedbetale gjeld med!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Hvor mye ønsker du å tilbakebetale? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Aksjetransaksjon for %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Aksjer utstedt: "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Aksjer igjen:   "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Pris per aksje: "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Utbytte:        "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Aksjeportefølge: "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Eierandel:       "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Kontanter:       "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Kjøp aksjer fra selskap"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Selg aksjer tilbake til selskap"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Be firmaet utstede flere aksjer"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Forlat børsen"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Angi valg [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Ingen aksjer tilgjengelig  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Ingen flere aksjer er tilgjengelig for kjøp."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Ikke nok penger  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Du har ikke nok penger\n"
+"til å kjøpe flere aksjer."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Du kan kjøpe ^{en^} aksje."
+msgstr[1] "Du kan kjøpe opptil ^{%'ld^} aksjer."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Hvor mange aksjer ønsker du å kjøpe? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Ingen aksjer  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Du har ingen aksjer å selge."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Du kan selge ^{en^} aksje."
+msgstr[1] "Du kan selge opptil ^{%'ld^} aksjer."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Hvor mange aksjer ønsker du å selge? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Ingen aksjer utstedt  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls har avslått\n"
+"å utstede flere aksjer."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Aksjer utstedt  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls har utstedt\n"
+"^{en^} ny aksje."
+msgstr[1] ""
+"%ls har utstedt\n"
+"^{%'ld^} nye aksjer."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: manglende felt på linje %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: ulovlig felt på linje %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: ugyldig felt på linje %d: «%s»"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: ugyldig verdi på linje %d: «%s»"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: ugyldig verdi på linje %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: ugyldig tegn på linje %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: kunne ikke konvertere streng"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Spill ikke funnet  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Spillet %d er ikke lagret på disken."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Spill ikke lastet  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke lastes fra disk.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: mangler topptekst i spillfilen"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: ikke en gyldig spillfil"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: mangler undertittel i spillfilen"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: lagret under en annen versjon av Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: lagret med en inkompatibel tegnkoding"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: ulovlig eller manglende felt på linje %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Spill ikke lagret  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke lagres til disk.\n"
+"\n"
+"^{Mappe %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spillet %d kunne ikke lagres til disken.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  er et enkelt spill med  interstellar handel. Målet med spillet\n"
+"er å samle  størst  mulig  formue. Dette  gjøres  ved å skape  interstellare\n"
+"seilingsleder,  utvide dem  og kjøpe aksjer  i selskapene  for å kontrollere\n"
+"dem. Aksjer  stiger i verdi ettesom  selskapsoperasjonene utvides. Dessuten,\n"
+"avkastningen på hver del (i prosent) endres også. Spillere kan også låne fra\n"
+"Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n"
+"\n"
+"Kartet  over galaksen  er representert  ved en  ^B~x^N x ^B~y^N  rutenett. En typisk\n"
+"seksjon kan være:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N forestiller ^Btomrom^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N forestiller en ^Bstjerne^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Datamaskinen velger  ^B~m^N  trekk (merket ^k~1^N to ^k~M^N) vilkårlig, og legger disse på\n"
+"kartet. For å velge noen av de markerte stedene, trykk på bokstaven. Noen av\n"
+"trekkene på kartet kan for eksempel være:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Trekk ^k~1^N til ^k~5^N vist.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Å velge en posisjon  som ^Bikke^N er ved siden  av en stjerne  (trekk som  ^k~1^N,  ^k~3^N\n"
+"eller ^k~5^N)  vil sette opp  en ^Butpost^N,  som ikke tilhører  noe selskap. Slik at\n"
+"hvis  trekk ^k~3^N er  valgt  på  kartet  ovenfor vil ^o ~+ ^N bli  plassert  ved  den\n"
+"posisjonen.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Hvis  på den annen side  en posisjon  ved siden  av en stjerne  (eller annen\n"
+"utpost) er valgt, vil et ^Bfirma^N bli dannet  og dets  bokstav vises på kartet.\n"
+"Som en belønning for å skape firmaet får du de første fem aksjene. Opp til ^B~c^N\n"
+"firmaer kan opprettes på denne måten.\n"
+"\n"
+"Hvis en posisjon ved siden av et eksisterende selskap er valgt vil selskapet\n"
+"utvide sin virksomhet  med én rute. Dette øker kostnadene til dets aksjer og\n"
+"dermed  avkastningen. Dermed,  hvis kartet  er som vist nedenfor,  å velge ^k~6^N\n"
+"eller ^k~8^N øker selskapet ^B~B^Ns skipslei:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Trekk ^k~6^N eller ^k~8^N øker selskapet ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Å velge posisjoner ved siden  av stjerner øker verdien av din beholdning med\n"
+"ca. fem  ganger  så mye som  en forlengelse  som  ikke  er ved  siden  av en\n"
+"stjerne. Derfor bør trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Trekk ^k~6^N foretrekkes fremfor ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Du kan også  utvide ethvert  selskap  ved  å velge posisjoner  ved  siden av\n"
+"utposter. Slike utposter  vil bli slukt av det selskapet. Dermed vil trekk ^k~1^N\n"
+"utvide  selskap ^B~C^N  med ^Bto^N kvadrater. Som en bonus  er utposter  ved siden av\n"
+"stjernene mer verdifulle: selskapets aksjekurs  vil øke med en større mengde\n"
+"enn det ville gjort for utposter som ikke er ved siden av stjerner.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Hvis to selskaper  skilles på kartet  ved bare  én rute, kan de ^Bfusjoneres^N i\n"
+"ett selskap  ved å velge den posisjonen (hvis tilgjengelig). For eksempel på\n"
+"kartet nedenfor  kan bedriftene ^B~A^N og ^B~B^N  fusjoneres  ved å velge ^k~5^N. Når dette\n"
+"skjer tar selskapet  med størst aktiva over det andre. Her kan  selskap ^B~B^N ta\n"
+"over selskap ^B~A^N. Selskap ^B~A^N opphører  å eksistere, selv  om det kan  dukke opp\n"
+"igjen som en helt nytt selskap på et senere tidspunkt.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Trekk ^k~5^N fusjonerer selskapene ^B~A^N og ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"Når selskaper  fusjonerer  blir spillerne  tildelt aksjer  i det dominerende\n"
+"selskapet  proporsjonal med mengden  eid i det  gamle selskapet. En kontant-\n"
+"bonus blir og utbetalt, proporsjonalt med eierandelen i det gamle selskapet.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Når du har valgt ditt trekk går du inn i ^BInterstellar Børs^N. Her kan du kjøpe\n"
+"og selge aksjer, låne fra Handelsbanken  eller tilbakebetale  noe av gjelden\n"
+"din  (hvis det  er aktuelt). Merk at hvert  selskap  utsteder  et  begrenset\n"
+"antall aksjer — du kan ikke fortsette  å kjøpe for alltid! Du kan imidlertid\n"
+"by på flere aksjer som utstedes. Du har en bedre sjanse for å lykkes hvis du\n"
+"eier en større andel av selskapet.\n"
+"\n"
+"Normalt slutter spillet etter  ^B~t^N  runder. Men du kan avslutte tidligere ved\n"
+"å trykke  ^K<CTRL><C>^N  når anmodet  om å velge et trekk. Individuelle spillere\n"
+"kan erklære seg  konkurs når som helst. Hvis gjelden er stor nok, kan banken\n"
+"gjøre dette  for deg! Hvis du  ikke  fullfører  spillet  i den tiden  du har\n"
+"tilgjengelig, kan du lagre spillet og fortsette senere.\n"
+"\n"
+"\n"
+"^BVinneren  av  spillet^N  er  den personen  med  størst  formue  (totalverdi av\n"
+"kontanter, aksjer og gjeld). ^HLykke til^N, må den beste vinne!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Hjelpetekst, side 7\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Hjelpetekst, side 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Hjelpetekst, side 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Hjelpetekst, side 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Slik spiller man  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side  %d av %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Trykk <MELLOMROM> for å fortsette ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Trykk <MELLOMROM> for å fortsette eller <BACKSPACE> for forrige side ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: streng har feil format: «%s»"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: tegn har ugyldig bredde: «%lc»"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "terminal størrelsen er for liten (%d x %d kreves)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: «%s»"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: ugyldig tegn i streng: «%ls»"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Jj"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Ja"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Nei"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "ikke mer minne"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: «%s»"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: «%lc»"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: valget «%s» er flertydig; muligheter:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: valget «%s» er flertydig\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: valget «--%s» tillater ikke et argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: valget «--%s» krever et argument\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ukjent valg «--%s»\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ugyldig valg -- «%c»\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: valget krever et argument -- «%c»\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: valget «-W %s» krever et argument\n"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..226ac39
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,1703 @@
+# *************************************************************************
+# *                                                                       *
+# *                 Russian Translations for Star Traders                 *
+# *             Русский перевод для игры «Звёздные торговцы»              *
+# *                Copyright (C) 1990-2012, John Zaitseff                 *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-12.
+#   Vladimir B. Tsarkov <lipetsk-gnu-lug@bk.ru>, 2012.
+#   Pavel Maryanov <acid@jack.kiev.ua>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.4-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2012-03-27 10:37+1100\n"
+"PO-Revision-Date: 2012-03-29 11:20+0200\n"
+"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
+"Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: неверное значение аргумента для --maxturn: «%s»\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: неверный аргумент «%s»\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: неверный номер игры «%s»\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: лишний аргумент «%s»\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Звёздные торговцы / Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"«Звёздные торговцы» — это простая игра о межзвёздной торговле, где целью\n"
+"игры является создание компаний, покупка и продажа акций, получение и\n"
+"погашение кредита, чтобы стать самым богатым игроком-победителем.\n"
+"\n"
+"Это свободное программное обеспечение, распространяемое согласно GNU\n"
+"General Public License версии 3 или новее.  Вы можете модифицировать и/или\n"
+"распространять его на этих условиях.  На программу не предоставляется НИКАКИХ\n"
+"ГАРАНТИЙ до степени, разрешённой законом.  Для получения более подробной\n"
+"информации, обратитесь к веб-странице <http://www.gnu.org/licenses/gpl.html>.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Попробуйте «%s --help» для получения более подробного описания.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Использование: %s [КЛЮЧ ...] [ИГРА]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Играть в «Звёздные торговцы», простую игру о межзвёздной торговле.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Ключи:\n"
+"  -V, --version         показать информацию о версии и выйти\n"
+"  -h, --help            показать эту справку и выйти\n"
+"      --no-color        не пользоваться цветами во время игры\n"
+"      --max-turn=НОМЕР  установить НОМЕР как максимальный ход игры\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Если в качестве аргумента ИГРА указано число от 1 до 9, загрузить и\n"
+"продолжать соответствующую сохранённую игру.  По умолчанию, начать\n"
+"новую игру.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Об ошибках сообщайте по адресу %s <%s>.\n"
+"Об ошибках в русском переводе сообщайте по тому же адресу.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Об ошибках сообщайте по адресу <%s>.\n"
+"Об ошибках в русском переводе сообщайте по тому же адресу.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Об ошибках в %s сообщайте по адресу <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr ""
+"Домашняя страница игры «Звёздные торговцы»:\n"
+"    %s\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H").  No company name should be more
+#. than 24 characters (column positions, to be precise) long.
+#: src/globals.c:46
+msgid "Altair Starways"
+msgstr "Альтаирские торговцы"
+
+#: src/globals.c:47
+msgid "Betelgeuse, Ltd"
+msgstr "ОАО «Бетельгейзе»"
+
+#: src/globals.c:48
+msgid "Capella Freight Co"
+msgstr "Возчики вегавские"
+
+#: src/globals.c:49
+msgid "Denebola Shippers"
+msgstr "Грузоотправители Гидры"
+
+#: src/globals.c:50
+msgid "Eridani Expediters"
+msgstr "Диспетчеры Денеболы"
+
+#: src/globals.c:51
+msgid "Fornax Express"
+msgstr "Единодушные трейдеры"
+
+#: src/globals.c:52
+msgid "Gemeni Inc"
+msgstr "Живой брокер Капеллы"
+
+#: src/globals.c:53
+msgid "Hercules and Co"
+msgstr "Звёздные линии Земли"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:67
+msgid "ABCDEFGH|input|Companies"
+msgstr "АБВГДЕЖЗ|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:79
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "АБВГДЕЖЗИЙКЛМНОПРСТУ|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:91
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*АБВГДЕЖЗ|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:102
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "абвгдежзийклмнопрсту|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:113
+msgid "1st"
+msgstr "1-й"
+
+#: src/globals.c:114
+msgid "2nd"
+msgstr "2-й"
+
+#: src/globals.c:115
+msgid "3rd"
+msgstr "3-й"
+
+#: src/globals.c:116
+msgid "4th"
+msgstr "4-й"
+
+#: src/globals.c:117
+msgid "5th"
+msgstr "5-й"
+
+#: src/globals.c:118
+msgid "6th"
+msgstr "6-й"
+
+#: src/globals.c:119
+msgid "7th"
+msgstr "7-й"
+
+#: src/globals.c:120
+msgid "8th"
+msgstr "8-й"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Загружается игра №%d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Первый игрок  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Первый игрок избран: ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Введите число игроков [^{1^}-^{%d^}], или ^{<П>^} для продолжения старой игры: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Пп"
+
+#: src/game.c:341 src/move.c:390
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Введите номер игры [^{1^}-^{9^}], или ^{<CTRL><C>^}, чтобы отменить: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Ваше имя: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Показать справку о том, как играть? [^{Д^}/^{Н^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Имена игроков  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Игрок №%d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Показать справку о том, как играть? [^{Д^}/^{Н^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Конец игры  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Игра закончена после %d-го хода."
+msgstr[1] "Игра закончена после %d-го хода."
+msgstr[2] "Игра закончена после %d-го хода."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Нетто-стоимость  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Ваша нетто-стоимость равна ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Победитель игры — ^{%ls^},\n"
+"который является ^[*** БАНКРОТОМ ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Победитель игры — ^{%ls^}!\n"
+"Нетто-стоимость этого игрока равна ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Победитель игры  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:859
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Игрок"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Нетто-стоимость (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Игрок: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Ход: ^{%d-й^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Крайний ход ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Портфель акций  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   О Б А Н К Р О Т И В Ш И Й С Я   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Нет акционерных обществ на карте"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Фирма"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Владение\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Владение\n"
+"(акции)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Возврат\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Цена\n"
+"акции (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Нетто-стоимость игрока: "
+
+#: src/game.c:800 src/exch.c:322
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Текущие наличные:       "
+
+#: src/game.c:807 src/exch.c:330
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Текущая задолженность:  "
+
+#: src/game.c:813 src/exch.c:335
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Процентная ставка:      "
+
+#: src/move.c:239 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Показать портфель акций"
+
+#: src/move.c:241
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Объявить о банкротстве"
+
+#: src/move.c:243
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Сохранить и выйти из игры"
+
+#: src/move.c:245
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Выйти из игры"
+
+#: src/move.c:249
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Введите выбор [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:286
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Позиция ^{%lc^}"
+
+#: src/move.c:307
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Объявить о банкротстве)"
+
+#: src/move.c:316
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Сохранить и выйти из игры)"
+
+#: src/move.c:337
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Выйти из игры)"
+
+#: src/move.c:352
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Вы уверены? [^{Д^}/^{Н^}] "
+
+#: src/move.c:369 src/move.c:447
+#, c-format
+msgid "Saving game %d... "
+msgstr "Сохраняется игра №%d... "
+
+#: src/move.c:677 src/move.c:685 src/move.c:1043 src/move.c:1080
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Арбитражный суд  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:679
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "Межзвёздный торговый банк объявляет, что игрок %ls обанкротился."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:687
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls объявляет о своём банкротстве."
+
+#: src/move.c:755
+#, c-format
+msgid "  New Company  "
+msgstr "  Новая фирма  "
+
+#: src/move.c:756
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Сформировано новое торговое предприятие!\n"
+"Оно называется ^{%ls^}."
+
+#: src/move.c:815
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr "Фирма ^{%ls^} только что была поглощена фирмой ^{%ls^}. Обратите внимание на следующие транзакции:\n"
+
+#: src/move.c:821
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Слияние компаний  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:841
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Старые акции: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:852
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Новые акции:  "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:866
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Бонус (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:871
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Итог"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:878
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Новые"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:884
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Старые"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1045
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"Межзвёздный торговый банк объявляет, что фирма %ls обанкротилась.\n"
+"\n"
+"^{Все активы использованы банком, чтобы погасить долги фирмы.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1069
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"Межзвёздный торговый банк объявляет, что фирма %ls обанкротилась.\n"
+"\n"
+"^{Банк согласился выплатить акционерам^}\n"
+"%.2f%%^{ от стоимости акций.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1097
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Выплаченная сумма за акцию: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1105
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Старая цена акции:          "
+
+#: src/move.c:1188 src/move.c:1223 src/exch.c:319
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Межзвёздный торговый банк  "
+
+#: src/move.c:1190
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Вам пришлось взять кредит в размере %N\n"
+"для покрытия убытка на акции компаний."
+
+#: src/move.c:1225
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Ваш долг составляет %N!\n"
+"\n"
+"^{Межзвёздный торговый банк конфисковал^}\n"
+"%N^{ из ваших наличных денег.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Межзвёздная фондовая биржа  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Оставшиеся\n"
+"акции"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Выпущенные\n"
+"акции"
+
+#: src/exch.c:184
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Показать карту галактики"
+
+#: src/exch.c:186
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Посетить торговый банк"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Выйти из фондовой биржи"
+
+#: src/exch.c:191
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Введите выбор [^[Код фирмы^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:349
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Предел кредита:         "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:364
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Занимать деньги"
+
+#: src/exch.c:366
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Погашать долг  "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Выйти из банка "
+
+#: src/exch.c:371
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Введите выбор [^{1^}-^{3^}]: "
+
+#: src/exch.c:424
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Недостаточный предел кредита  "
+
+#: src/exch.c:425
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Банк не готов предоставлять вам больше денег."
+
+#: src/exch.c:445
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Сколько вы хотите взять в кредит? "
+
+#: src/exch.c:477
+#, c-format
+msgid "  No Debt  "
+msgstr "  Нет долга  "
+
+#: src/exch.c:478
+#, c-format
+msgid "You have no debt to repay."
+msgstr "У вас нет долга для погашения."
+
+#: src/exch.c:482
+#, c-format
+msgid "  No Cash  "
+msgstr "  Нет наличных  "
+
+#: src/exch.c:483
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "У вас нет наличных для погашения долга!"
+
+#: src/exch.c:503
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Сколько вы хотите вернуть? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:579
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Биржевые операции в фирме %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:590
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Выпущенные акции: "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:598
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Оставшиеся акции: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:605
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Цена акции:       "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:611
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Возврат:          "
+
+#. TRANSLATORS: "Current holdings" is the number of shares the
+#. current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:624
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Владение (акции): "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:631
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Владение:         "
+
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Текущие наличные: "
+
+#: src/exch.c:647
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Покупать акции от фирмы"
+
+#: src/exch.c:649
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Продавать акции обратно фирме"
+
+#: src/exch.c:651
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Предлагать фирме выпустить акции"
+
+#: src/exch.c:653
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Выйти на фондовую биржу"
+
+#: src/exch.c:656
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Введите выбор [^{1^}-^{4^}]: "
+
+#: src/exch.c:712
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Акции недоступны  "
+
+#: src/exch.c:713
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Не осталось больше акций для покупки."
+
+#: src/exch.c:717
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Недостаточно наличных  "
+
+#: src/exch.c:718
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"У вас недостаточно наличных денег, чтобы\n"
+"приобрести дополнительные акции."
+
+#: src/exch.c:729
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Вы можете приобрести до ^{%'ld^} акции."
+msgstr[1] "Вы можете приобрести до ^{%'ld^} акций."
+msgstr[2] "Вы можете приобрести до ^{%'ld^} акций."
+
+#: src/exch.c:735
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Сколько акций вы хотите приобрести? "
+
+#: src/exch.c:756
+#, c-format
+msgid "  No Shares  "
+msgstr "  Нет акций  "
+
+#: src/exch.c:757
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "У вас нет ни одной акции для продажи."
+
+#: src/exch.c:764
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Вы можете продать до ^{%'ld^} акции."
+msgstr[1] "Вы можете продать до ^{%'ld^} акций."
+msgstr[2] "Вы можете продать до ^{%'ld^} акций."
+
+#: src/exch.c:770
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Сколько акций вы хотите продать? "
+
+#: src/exch.c:798
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Акции не выпущены  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:800
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr "Фирма %ls отказалась выпустить больше акций."
+
+#: src/exch.c:805
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Акции выпущены  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"Фирма %ls выпустила\n"
+"ещё ^{%'ld^} акцию."
+msgstr[1] ""
+"Фирма %ls выпустила\n"
+"ещё ^{%'ld^} акции."
+msgstr[2] ""
+"Фирма %ls выпустила\n"
+"ещё ^{%'ld^} акций."
+
+#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: отсутствующее поле в строке %d"
+
+#: src/fileio.c:60
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: неверное поле в строке %d: «%s»"
+
+#: src/fileio.c:64
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: неверное значение в строке %d: «%s»"
+
+#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: неверное значение в строке %d"
+
+#: src/fileio.c:103
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: неверные символы в строке %d"
+
+#: src/fileio.c:184
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: невозможно преобразовать строку"
+
+#: src/fileio.c:255
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Игра не найдена  "
+
+#: src/fileio.c:256
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Игра №%d не была сохранена."
+
+#: src/fileio.c:263
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Игра не загружена  "
+
+#: src/fileio.c:264
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Не удалось загрузить сохранённую игру №%d.\n"
+"\n"
+"^{Файл %s: %s^}"
+
+#: src/fileio.c:316
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: отсутствует заголовок в игровом файле"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: неверный формат игрового файла"
+
+#: src/fileio.c:322 src/fileio.c:329
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: отсутствует подзаголовок в игровом файле"
+
+#: src/fileio.c:325
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: файл сохранён в другой версии игры «Звёздные торговцы»"
+
+#: src/fileio.c:332
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: в файле используется неподдерживаемая кодировка символов"
+
+#: src/fileio.c:340
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: неверное поле или отсутствующее поле в строке %d"
+
+#: src/fileio.c:384
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: неверное поле в строке %d"
+
+#: src/fileio.c:466 src/fileio.c:487
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Игра не сохранена  "
+
+#: src/fileio.c:467
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Не удалось сохранить игру №%d.\n"
+"\n"
+"^{Папка %s: %s^}"
+
+#: src/fileio.c:488
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Не удалось сохранить игру №%d.\n"
+"\n"
+"^{Файл %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#: src/help.c:103
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^B«Звёздные торговцы»^N  ―  это простая игра  о межзвёздной торговле.  Цель игры\n"
+"состоит в том,  чтобы стать самым богатым игроком-победителем.  Это делается\n"
+"путём создания межзвёздных маршрутов доставки товаров, расширения этих марш-\n"
+"рутов, а также покупке и продаже акций  соответствующих акционерных обществ.\n"
+"Кроме того, возврат  на каждую акцию (в процентах) изменяется.  Игроки также\n"
+"могут занять  деньги  у Межзвёздного  торгового  банка,  чтобы финансировать\n"
+"дополнительные покупки на фондовой бирже.\n"
+"\n"
+"Карта галактики представлена сеткой размером ^B~x^N на ^B~y^N.  Типичная часть карты\n"
+"может быть:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N обозначает ^Bпустое пространство^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N обозначает ^Bзвезду^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:122
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Компьютер выбирает наугад ^B~m^N позиций на карте (обозначенные от ^k~1^N до ^k~M^N).  Для\n"
+"выбора  любого  из выделенных  позиций,  нажмите  на соответствующую  букву.\n"
+"Например, некоторые из этих позиций могут быть:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Показаны позиции от ^k~1^N до ^k~5^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Выбор позиции, что  ^Bне рядом^N  со звездой (как, например, ^k~1^N, ^k~3^N или ^k~5^N) создаст\n"
+"^Bфорпост^N не принадлежащий  к какой-либо компании.  Таким образом, выбор пози-\n"
+"ции ^k~3^N на указанной выше карте создаст форпост, обозначено символом ^o ~+ ^N.\n"
+
+#: src/help.c:140
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"При выборе позиции  рядом со звездой (или рядом с форпостом),  будет сформи-\n"
+"ровано ^Bновое торговое предприятие^N,  и код этой новой фирмы появится на карте\n"
+"галактики.  В качестве награды за создание компании, вы получите первые пять\n"
+"акций.  До ^B~c-и^N компаний могут быть созданы таким образом.\n"
+"\n"
+"При выборе позиции рядом с уже существующей компанией, эта компания расширит\n"
+"свою деятельность  на одну  клетку.  Это увеличивает  стоимость её  акций и,\n"
+"следовательно, вашего дохода.  Таким образом,  выбор позиции ^k~6^N или ^k~8^N на ука-\n"
+"занной ниже карте расширяет маршруты компании ^B~B^N:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Выбор ^k~6^N или ^k~8^N расширяет фирму ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:158
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Выбор позиции рядом со звездой  увеличивает стоимость ваших акций примерно в\n"
+"пять  раз, по сравнению  с расширением  фирмы клеткой  не рядом  со звездой.\n"
+"Таким образом, позиция ^k~6^N является более предпочтительной, чем позиция ^k~8^N.\n"
+"\n"
+"        ^e ^c~E^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Выбор ^k~6^N предпочтительнее выбора ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Вы также можете расширить любую  компанию, выбрав позицию рядом с форпостом.\n"
+"Такие форпосты будут  поглощены этой фирмой.  Таким образом,  позиция ^k~1^N рас-\n"
+"ширит маршруты компании ^B~E^N на ^Bдве^N клетки.  Притом, поглощение форпостов около\n"
+"звёзд имеет  большую ценность:  цена акций фирмы поднимется  гораздо больше,\n"
+"чем поглощение форпостов вдали от звёзд.\n"
+
+#: src/help.c:176
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Если две фирмы  разделяются  на карте  только одной  клеткой, то  выбор этой\n"
+"позиции (если есть такая возможность) ^Bобъединяет^N эти фирмы  в одну компанию.\n"
+"Например, выбор позиции ^k~5^N на указанной ниже  карте объединит компании ^B~A^N и ^B~B^N.\n"
+"В таком случае,  фирма с большей общей стоимостью  поглощает вторую.  Здесь,\n"
+"например,  компания ^B~B^N  может быть поглотит  компанию ^B~A^N.  Фирма ^B~A^N  прекращает\n"
+"своё существование,  хотя она может  появиться  позднее как совершенно новое\n"
+"акционерное общество в будущей части игры.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N        Выбор ^k~5^N сливает компании ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"\n"
+"При слиянии компаний, игрокам  выдаются акции доминирующей фирмы (пропорцио-\n"
+"нально  количеству акций,  которые  игрок имел  в поглощённом  предприятии).\n"
+"Кроме того, выплачивается бонус, пропорционально владению старой компании.\n"
+
+#: src/help.c:195
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"После выбора позиции, вы оказываетесь на  ^BМежзвёздной фондовой бирже^N.  Здесь\n"
+"вы можете приобретать акции, продавать их, занимать деньги у торгового банка\n"
+"или погашать  часть своего долга  (если применимо).  Обратите  внимание, что\n"
+"каждая компания выпускает ограниченное количество акций ― нельзя просто бес-\n"
+"конечно покупать!   Однако,  можно предлагать фирме выпустить  больше акций.\n"
+"Чем больше ваше владение в фирме, тем больше шансов получить больше акций.\n"
+"\n"
+"Игра обычно заканчивается  после ^B~t-и^N ходов.  Однако,  можно  закончить игру\n"
+"раньше, нажав ^K<CTRL><C>^N вместо выбора позиции.  Кроме того, отдельные игроки\n"
+"могут  объявить себя  банкротом  в любой момент.   Если ваш  долг достаточно\n"
+"велик, банк  может сделать  это за вас!   Если не хватает  времени закончить\n"
+"игру, вы можете сохранить её и продолжить позже.\n"
+"\n"
+"^BПобедителем игры^N  является игрок с самой большой  нетто-стоимостью, то есть,\n"
+"разностью между активами (наличные деньги + акции) и долгом.  ^HУдачи вам^N ― да\n"
+"победит лучший игрок!\n"
+
+#: src/help.c:215
+msgid "@ Help text, page 7\n"
+msgstr "@\n"
+
+#: src/help.c:216
+msgid "@ Help text, page 8\n"
+msgstr "@\n"
+
+#: src/help.c:217
+msgid "@ Help text, page 9\n"
+msgstr "@\n"
+
+#: src/help.c:218
+msgid "@ Help text, page 10\n"
+msgstr "@\n"
+
+#: src/help.c:270
+#, c-format
+msgid "  How to Play  "
+msgstr "  Как играть в «Звёздные торговцы»  "
+
+#: src/help.c:272
+#, c-format
+msgid "Page %d of %d"
+msgstr "Страница №%d из %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:473 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and
+#. <BACKSPACE> is not essential: you can use <DEL>,
+#. <PAGE-UP>, <UP>, <LEFT> or <BACK-TAB> instead of
+#. <BACKSPACE>, and almost any other key instead of
+#. <SPACE> (other than <ESC>, <CANCEL>, <EXIT>, <CTRL><C>,
+#. <CTRL><G> or <CTRL><\>).
+#: src/help.c:480
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> — вернуться на пред. страницу ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: строка имеет неверный формат: «%s»"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: символ имеет неверную ширину: «%lc»"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "размеры терминала слишком малы (нужны %d на %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Звёздные торговцы"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: «%s»"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=?*\\/"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: неверный символ в строке: «%ls»"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Дд1+"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Нн0-"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Да"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Нет"
+
+#: src/utils.c:199 src/utils.c:220
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:225
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:238
+#, c-format
+msgid "out of memory"
+msgstr "недостаточно памяти"
+
+#: src/utils.c:571
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: «%s»"
+
+#: src/utils.c:611
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:616
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: «%lc»"
+
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: неоднозначный ключ «--%s»; возможности:"
+
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: ключ «--%s» должен использоваться без аргумента\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: ключ «%c%s» должен использоваться без аргумента\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: ключ «--%s» должен использоваться с аргументом\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: неизвестный ключ «--%s»\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: неизвестный ключ «%c%s»\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: неверный ключ «%c»\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: ключ «%c» должен использоваться с аргументом\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: неоднозначный ключ «-W %s»\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: ключ «-W %s» должен использоваться без аргумента\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ключ «-W %s» должен использоваться с аргументом\n"
diff --git a/po/sr.po b/po/sr.po
new file mode 100644
index 0000000..84dd6ed
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,1731 @@
+# *************************************************************************
+# *                                                                       *
+# *                 Serbian Translation for Star Traders                  *
+# *                   Copyright (C) 2016, John Zaitseff                   *
+# *          Copyright (C) 2016, Free Software Foundation, Inc.           *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.9\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2016-01-05 10:52+1100\n"
+"PO-Revision-Date: 2016-03-21 13:17+1100\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <(nothing)>\n"
+"Language: sr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: неисправна вредност за „--max-turn“: „%s“\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: неисправан операнд „%s“\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: неисправан број игре „%s“\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: додатни операнд „%s“\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Звездани трговци (%s) %s\n"
+"Ауторска права © %s, Џон Зајцеф (John Zaitseff).\n"
+"\n"
+"Звездани трговци је једноставна игра међузвезданог трговања, у којој треба\n"
+"да оснивате предузећа, купујете и продајете акције, позајмљујете и враћате\n"
+"новац, да бисте постали најбогатији играч (победник).\n"
+"\n"
+"Овај програм је слободан софтвер који се расподељује под условима Гнуове\n"
+"опште јавне лиценце, 3. издања или новијег.  Можете слободно да га мењате\n"
+"и/или расподељујете под одређеним условима.  Овај програм је БЕЗ ГАРАНЦИЈЕ,\n"
+"у мери у којој то допушта закон; погледајте лиценцу за више детаља.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Пробајте „%s --help“ за више података.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Употреба: %s [ОПЦИЈА ...] [ИГРА]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Играјте Звездане трговце, једноставну игру међузвезданог трговања.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Могућности:\n"
+"  -V, --version        исписује податке о издању и излази\n"
+"  -h, --help           приказује ову помоћ и излази\n"
+"      --no-color       не користи боје за приказ текста\n"
+"      --max-turn=БРОЈ  поставља број враћања на БРОЈ\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Ако је за ИГРУ наведен број између 1 и 9, учитава и наставља са том игром.\n"
+"Ако ИГРА није наведена, почиње нову игру.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr "Грешке пријавите програмеру %s <%s>.\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr "Грешке пријавите на <%s>.\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Грешке „%s“ пријавите на <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Матична страница: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Алтар Звездаш"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Бетелгејз Свемир"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Велики Медвед"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Голењски Отпремник"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Денебола Достава"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Ђило Експрес"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Еридано Шпедиција"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Ждрал и Другари"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "АБВГДЂЕЖ|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "АБВГДЂЕЖЗИЈКЛЉМНЊОПР|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*АБВГДЂЕЖ|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "абвгдђежзијклљмнњопр|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1."
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2."
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3."
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4."
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5."
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6."
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7."
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8."
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Учитавам игру %d... "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Први играч  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Први играч на потезу је ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Упишите број играча [^{1^}-^{%d^}] или ^{<Н>^} да наставите игру: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Нн"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Упишите број игара [^{1^}-^{9^}] или ^{<КТРЛ><Ц>^} да откажете: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Упишите ваше име: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Да ли су вам потребна упутства? [^{Д^}/^{Н^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Упишите имена играча  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "%d. играч: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Да ли су неком играчу потребна упутства? [^{Д^}/^{Н^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Крај игре  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Игра је завршена након %d круга."
+msgstr[1] "Игра је завршена након %d круга."
+msgstr[2] "Игра је завршена након %d кругова."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Укупан износ  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Ваш укупан износ је ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Победник је ^{%ls^}\n"
+"који је под ^[*** СТЕЧАЈЕМ ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Победник је ^{%ls^}\n"
+"са износом од ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Победник игре  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Играч"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Укупан износ (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Играч: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Круг: ^{%d^}  "
+
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Последњи круг ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Портфељ удела  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   С Т Е Ч А Ј   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Нема предузећа на карти"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Предузеће"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Власништво\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Поседује\n"
+"(акција)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Зарада\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Цена по\n"
+"акцији (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Укупан износ:       "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Текућа готовина:    "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Текући дуг:         "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Каматна стопа:      "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Прикажите портфељ удела"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Објавите стечај"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Сачувајте и завршите игру"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<КТРЛ><Ц>^} Изађите из игре"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Изаберите потез [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<КТРЛ><Ц>^}]: "
+
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "На потезу ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Објавите стечај)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Сачувајте и завршите игру)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<КТРЛ><Ц>^} (Изађите из игре)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Да ли сте сигурни? [^{Д^}/^{Н^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Чувам игру %d... "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Стечајни суд  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "Међузвездана Трговачка Банка је објавила стечај играчу %ls."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls је објавио стечај."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Ново предузеће  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Направљено је ново предузеће!\n"
+"Њено име је ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} је управо спојено са ^{%ls^}.\n"
+"Имајте на уму следећу трансакцију:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Спајач предузећа  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Стари удео: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Нови удео:  "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Бонус (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Укупно"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Нове"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Старе"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"Међузвездана Трговачка Банка је објавила стечај предузећу %ls.\n"
+"\n"
+"^{Сва добра су одузета зарад отплаћивања основних зајмова.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"Међузвездана Трговачка Банка је објавила стечај предузећу %ls.\n"
+"\n"
+"^{Банка је пристала да исплати акционарима ^}%.2f%%^{ од вредности акције по свакој поседованој акцији.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Плаћени износ по акцији: "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Стара вредност акције:   "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Међузвездана Трговачка Банка  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Приморани сте да позајмите %N да\n"
+"покријете губитке акција предузећа."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Ваш дуг је нарастао на %N!\n"
+"^{Банка је запленила ^}%N^{ од ваше готовине.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Међузвездана берза  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Преосталих\n"
+"акција"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Издатих\n"
+"акција"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Прикажите карту галаксије"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Посетите Трговачку Банку"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Изађите из Берзе"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Унесите избор [^[Слово предузећа^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Ограничење кредита: "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Позајмите новац  "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Платите дуг      "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Изађите из Банке "
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Унесите избор [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Недовољно ограничење кредита  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Банка вам више неће дати новац на зајам."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Колико желите да позајмите? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Без дуга  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Немате дугове за отплаћивање."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Без готовине  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr "Немате готовине за отплаћивање дуга!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Колико желите да отплатите? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Пренос удела у %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Издатих акција:    "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Преосталих акција: "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Цена по акцији:    "
+
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Зарада:            "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Тренутно држи:       "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Проценат власништва: "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Текућа готовина:     "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Купите удео у предузећи"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Препродајте удео предузећу"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Тражите предузећу да изда акције"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Изађите са Берзе"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Унесите избор [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Нема доступних акција  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Нема више доступних акција за куповину."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Недовољно готовине  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Немате довољно готовине да\n"
+"купите додатне акције."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Можете да купите ^{%'ld^} акцију."
+msgstr[1] "Можете да купите ^{%'ld^} акције."
+msgstr[2] "Можете да купите ^{%'ld^} акција."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Колико акција желите да купите? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Без акција  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Немате ниједну акцију за продају."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Можете да продате ^{%'ld^} акцију."
+msgstr[1] "Можете да продате до ^{%'ld^} акције."
+msgstr[2] "Можете да продате до ^{%'ld^} акција."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Колико акција желите да продате? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Нема издатих акција  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls је одбио да\n"
+"изда још акција."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Издате акције  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls је издало\n"
+"још ^{%'ld^} акцију."
+msgstr[1] ""
+"%ls је издало\n"
+"још ^{%'ld^} акције."
+msgstr[2] ""
+"%ls је издало\n"
+"још ^{%'ld^} акција."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: недостаје поље у %d. реду"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: недозвољено поље у %d. реду"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: недозвољено поље у %d. реду: „%s“"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: недозвољена вредност у %d. реду: „%s“"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: недозвољена вредност у %d. реду"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: недозвољени знакови у %d. реду"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: не могу да претворим ниску"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Нисам нашао игру  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "%d. игра није сачувана на диск."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Игра није учитана  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"%d. игра се не може учитати са диска.\n"
+"\n"
+"^{Датотека „%s“: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: недостаје заглавље у датотеци игре"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: није исправна датотека игре"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: недостаје подзаглавље у датотеци игре"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: сачувана под другим издањем Звезданих трговаца"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: сачувана под несагласним кодирањем знакова"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: недозвољено или недостаје поље у %d. реду"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Игра није сачувана  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"%d. игра се не може сачувати на диск.\n"
+"\n"
+"^{Директоријум „%s“: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"%d. игра се не може сачувати на диск.\n"
+"\n"
+"^{Датотека „%s“: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BЗвездани трговци^N је једноставна игра међузвезданог трговања.  Циљ игре је да\n"
+"сакупите што је  могуће веће богатство.  То ћете  постићи оснивањем међузве-\n"
+"зданих трговачких путева, њиховим проширивањем и куповањем акција у предузе-\n"
+"ћима која њима управљају.  Акцијама расте вредност како предузеће буде пове-\n"
+"ћавало пословање.   Поред тога,  зарада на свакој акцији  (у процентима)  се\n"
+"такође мења.  Играчи  такође могу позајмити новац  од Међузвездане Трговачке\n"
+"Банке да би финансирали додатне куповине на берзи.\n"
+"\n"
+"Карта галаксије је представљена мрежом величине  ^B~x^N x ^B~y^N.  Уобичајени приказ\n"
+"одељка галаксије може бити:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N представља ^Bпразан простор^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N представља ^Bзвезду^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Рачунар бира  ^B~m^N потеза  (означених  од ^k~1^N до ^k~M^N) насумично,  и поставља их на\n"
+"карти.  Да изаберете било који од истакнутих положаја,  притисните то слово.\n"
+"На пример, неки од потеза на карти може бити:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Приказани потези од ^k~1^N до ^k~5^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Бирање положаја који ^Bније^N поред звезде (као што су потези ^k~1^N, ^k~3^N или ^k~5^N) ће по-\n"
+"десити ^Bиспоставу^N,  која не припада ни једном предузећу.  Стога, ако је потез\n"
+"^k~3^N изабран на горњој карти, биће постављен ^o ~+ ^N на том положају.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Ако је,  у другом случају,  положај поред звезде  (или друге испоставе) иза-\n"
+"бран, ^Bпредузеће^N ће се основати а његово слово  ће се појавити на карти.  Као\n"
+"награда за оснивање  предузећа,  зарађујете првих пет акција.  На овај начин\n"
+"се могу основати ^B~c^N предузећа.\n"
+"\n"
+"Ако је положај поред  постојећег предузећа изабран,  предузеће неће повећати\n"
+"своје деловање за један квадрат.  Ово повећава трошкове  његових акција а са\n"
+"тим и ваше зараде.  Стога, ако је карта била као што је приказано испод, би-\n"
+"рање ^k~6^N или ^k~8^N повећава ^B~B^N доставне линије предузећа:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~6^N или ^k~8^N повећава предузеће ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Бирање положаја  поред звезда повећава вредност ваших залиха  око пет пута у\n"
+"односу на проширење  које није  поред звезде.  Стога потез  ^k~6^N  треба  да има\n"
+"предност над потезом ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Потез ^k~6^N је пожељнији од ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Можете такође да проширите било  које предузеће бирајући положај поред испо-\n"
+"става.  Такве испоставе  биће прогутане тим предузећем.  Стога ће,  потез  ^k~1^N\n"
+"проширити предузеће ^B~C^N за ^Bдва^N квадрата.  Као бонус, испоставе поред звезда су\n"
+"вредније:  цена акције предузећа ће се повећати већим износом него што би то\n"
+"било за испоставе које нису поред звезда.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Ако су два предузећа одвојена на карти само једним квадратом, тада могу бити\n"
+"^Bспојена^N у једно предузеће  бирањем тог положаја  (ако је доступан).  На при-\n"
+"мер, на карти испод,  предузећа ^B~A^N и ^B~B^N  могу бити спојена бирањем ^k~5^N.  Када до\n"
+"тога дође,  предузеће са већом  вредношћу добара преузима  ово друго.  Овде,\n"
+"предузеће ^B~B^N може  да преузме предузеће ^B~A^N.  Предузеће ^B~A^N  престаје да постоји,\n"
+"иако може да се појави као потпуно ново предузеће у каснијој фази.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N        Потез ^k~5^N спаја предузеће ^B~A^N и ^B~B^N.\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"\n"
+"Када се предузећа споје,  играчима се одобравају акције у доминантном преду-\n"
+"зећу пропорционално поседованом износу у старом предузећу.  Такође, готовин-\n"
+"ски бонус се такође плаћа, пропорционално проценту поседништва старог преду-\n"
+"зећа.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"Након што изаберете  ваш потез, упишите  ^BМеђузвездана берза^N.  Овде можете да\n"
+"купите акције,  да их продате, да позајмите новац  од Трговачке Банке или да\n"
+"отплатите нека дуговања (ако је примењиво).  Знајте да свако предузеће изда-\n"
+"је ограничени број акција — не можете куповати заувек!  Можете,  међутим, да\n"
+"затражите  издавање још акција.  Веће су вам  шансе за успех  ако поседујете\n"
+"већи део предузећа.\n"
+"\n"
+"Игра се обично  завршава након  ^B~t^N круга.  Међутим,  можете да завршите игру\n"
+"раније притиском на  ^K<КТРЛ><Ц>^N  када се од вас буде тражило да изаберете по-\n"
+"тез.  Исто тако, појединачни играчи могу себе да одведу у стечај у било које\n"
+"време.  Ако је ваш дуг поприлично велик,  Банка може то да уради уместо вас!\n"
+"Ако не довршите игру за време које вам је на располагању, можете да сачувате\n"
+"игру и касније да је наставите.\n"
+"\n"
+"^BПобедник игре^N је играч  са највећом  нето вредношћу  (укупан износ готовине,\n"
+"залиха и дуговања).  ^HСрећно^N и нека победи најбољи!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Текст помоћи, 7. страница\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Текст помоћи, 8. страница\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Текст помоћи, 9. страница\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Текст помоћи, 10. страница\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Како да играте  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d. страница од %d"
+
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Притисните <РАЗМАК> да наставите ] "
+
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Притисните <РАЗМАК> да наставите или <ПОВРАТНИЦУ> за претходну страницу ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: ниска је у погрешном запису: „%s“"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: знак је недозвољене ширине: „%lc“"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "величина терминала је премала (потребна је %d x %d)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Звездани трговци"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: НИШТА"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: „%s“"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: недозвољени знак у нисци: „%ls“"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "Дд"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Нн"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Да"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Не"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "нема више меморије"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: „%s“"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: НИШТА"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: „%lc“"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: опција „%s“ је нејасна; могућности:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: опција „%s“ је нејасна\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: опција „--%s“ захтева аргумент\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: непозната опција „--%s“\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: непозната опција „%c%s“\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: неисправна опција -- „%c“\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: опција захтева аргумент -- „%c“\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: опција „-W %s“ је нејасна\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опција „-W %s“ захтева аргумент\n"
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..f2d4336
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,1735 @@
+# *************************************************************************
+# *                                                                       *
+# *                 Swedish Translations for Star Traders                 *
+# *                   Copyright (C) 2015, John Zaitseff                   *
+# *                                                                       *
+# *************************************************************************
+#
+# This file is distributed under the same license as the trader package.
+#
+# Contributors:
+#   Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trader 7.8-pre1\n"
+"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
+"POT-Creation-Date: 2015-08-26 23:17+1000\n"
+"PO-Revision-Date: 2015-08-30 23:19+0200\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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: Poedit 1.8.3\n"
+
+#: src/trader.c:235
+#, c-format
+msgid "%s: invalid value for --max-turn: `%s'\n"
+msgstr "%s: ogiltigt värde för --max-turn: ”%s”\n"
+
+#: src/trader.c:251
+#, c-format
+msgid "%s: invalid operand `%s'\n"
+msgstr "%s: ogiltig operand ”%s”\n"
+
+#: src/trader.c:260
+#, c-format
+msgid "%s: invalid game number `%s'\n"
+msgstr "%s: ogiltigt spelnummer ”%s”\n"
+
+#: src/trader.c:269
+#, c-format
+msgid "%s: extra operand `%s'\n"
+msgstr "%s: extra operand ”%s”\n"
+
+#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
+#. name of the author.  The IPA pronunciation in this comment is in
+#. UTF-8 encoding.
+#: src/trader.c:284
+#, c-format
+msgid ""
+"Star Traders (%s) %s\n"
+"Copyright (C) %s, John Zaitseff.\n"
+"\n"
+"Star Traders is a simple game of interstellar trading, where the object\n"
+"of the game is to create companies, buy and sell shares, borrow and repay\n"
+"money, in order to become the wealthiest player (the winner).\n"
+"\n"
+"This program is free software that is distributed under the terms of the\n"
+"GNU General Public License, version 3 or later.  You are welcome to\n"
+"modify and/or distribute it under certain conditions.  This program has\n"
+"NO WARRANTY, to the extent permitted by law; see the License for details.\n"
+msgstr ""
+"Star Traders (%s) %s\n"
+"Copyright © %s, John Zaitseff.\n"
+"\n"
+"Star Traders är ett enkelt spel om interstellär handel, där spelets mål är\n"
+"att bilda företag, köpa och sälja aktier, låna och betala tillbaka pengar för\n"
+"att bli den rikaste spelaren (vinnaren).\n"
+"\n"
+"Detta program är fri programvara som distribueras under villkoren i GNU General\n"
+"Public License, version 3 eller senare.  Du är välkommen att ändra och/eller\n"
+"distribuera det under vissa villkor.  Detta program har INGEN GARANTI så långt\n"
+"lagen tillåter; se licensen för detaljer.\n"
+
+#: src/trader.c:308
+#, c-format
+msgid "%s: Try `%s --help' for more information.\n"
+msgstr "%s: Prova ”%s --help” för mer information.\n"
+
+#: src/trader.c:311
+#, c-format
+msgid "Usage: %s [OPTION ...] [GAME]\n"
+msgstr "Användning: %s [FLAGGA …] [SPEL]\n"
+
+#: src/trader.c:312
+#, c-format
+msgid ""
+"Play Star Traders, a simple game of interstellar trading.\n"
+"\n"
+msgstr ""
+"Spela Star Traders, ett enkelt spel om interstellär handel.\n"
+"\n"
+
+#: src/trader.c:315
+#, c-format
+msgid ""
+"Options:\n"
+"  -V, --version        output version information and exit\n"
+"  -h, --help           display this help and exit\n"
+"      --no-color       don't use color for displaying text\n"
+"      --max-turn=NUM   set the number of turns to NUM\n"
+"\n"
+msgstr ""
+"Flaggor:\n"
+"  -V, --version        visa versionsinformation och avsluta\n"
+"  -h, --help           visa denna hjälp och avsluta\n"
+"      --no-color       använd inte färg för att visa text\n"
+"      --max-turn=ANT   ställ in antalet omgångar till ANT\n"
+"\n"
+
+#: src/trader.c:322
+#, c-format
+msgid ""
+"If GAME is specified as a number between 1 and 9, load and continue\n"
+"playing that game.  If GAME is not specified, start a new game.\n"
+"\n"
+msgstr ""
+"Om SPEL anges som ett tal mellan 1 och 9, läs in och fortsätt spela\n"
+"det spelet.  Om SPEL inte är angivet startas ett nytt spel.\n"
+"\n"
+
+#. TRANSLATORS: The first %s is the proper name of the package
+#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is
+#. the e-mail address for reporting bugs.  Please add ANOTHER
+#. line with the (translated) text "Report translation bugs to
+#. <ADDRESS>\n", with ADDRESS replaced with either an e-mail
+#. address or web URL for reporting bugs in your translation.
+#: src/trader.c:334
+#, c-format
+msgid "Report bugs to %s <%s>.\n"
+msgstr ""
+"Rapportera fel till %s <%s>.\n"
+"Rapportera synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
+
+#. TRANSLATORS: %s is the e-mail address for reporting bugs.  As
+#. with the previous string, please add ANOTHER line with the
+#. (translated) text "Report translation bugs to <ADDRESS>\n",
+#. with ADDRESS replaced with either an e-mail address or web URL
+#. for reporting bugs in your translation.
+#: src/trader.c:341
+#, c-format
+msgid "Report bugs to <%s>.\n"
+msgstr ""
+"Rapportera fel till <%s>.\n"
+"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
+
+#. TRANSLATORS: The first %s is for packagers and may be
+#. something like "Debian".
+#: src/trader.c:346
+#, c-format
+msgid "Report %s bugs to <%s>.\n"
+msgstr "Rapportera %s-fel till <%s>.\n"
+
+#: src/trader.c:349
+#, c-format
+msgid "Star Traders home page: <%s>.\n"
+msgstr "Webbplats för Star Traders: <%s>.\n"
+
+#. TRANSLATORS: The eight company names do NOT have to be literal
+#. translations of the English names.  In fact, if possible, the
+#. names should start with successive letters of your alphabet (in
+#. English, for example, "A" to "H"), and, ideally, be related to
+#. constellations or stars in our galaxy.  No company name should be
+#. more than 24 characters (column positions, to be precise) long.
+#: src/globals.c:47
+msgid "Altair Starways"
+msgstr "Altair Starways"
+
+#: src/globals.c:48
+msgid "Betelgeuse, Ltd"
+msgstr "Betelgeuse Ltd"
+
+#: src/globals.c:49
+msgid "Capella Freight Co"
+msgstr "Capella Frakt AB"
+
+#: src/globals.c:50
+msgid "Denebola Shippers"
+msgstr "Denebola Spedition"
+
+#: src/globals.c:51
+msgid "Eridani Expediters"
+msgstr "Eridani Transport"
+
+#: src/globals.c:52
+msgid "Fornax Express"
+msgstr "Fornax Express"
+
+#: src/globals.c:53
+msgid "Gemini Inc"
+msgstr "Gemini Inc"
+
+#: src/globals.c:54
+msgid "Hercules and Co"
+msgstr "Herkules & Co"
+
+#. TRANSLATORS: This string specifies the keycodes (keyboard input
+#. codes) used to enter the Stock Transaction window for each
+#. company.  There must be exactly eight characters, one for each
+#. company in order, before the ASCII vertical line "|"; these must
+#. be EITHER all in upper-case or all in lower-case.  If at all
+#. possible, these should be successive letters in your alphabet (in
+#. English, "A" to "H").  Do NOT use digits or control characters.
+#. Do not change or translate anything after the vertical line.
+#: src/globals.c:68
+msgid "ABCDEFGH|input|Companies"
+msgstr "ABCDEFGH|input|Companies"
+
+#. TRANSLATORS: This string specifies the keycodes used to select a
+#. game move.  There must be exactly 20 characters, one for each
+#. move, before the ASCII vertical line "|"; these must be EITHER all
+#. in upper-case or all in lower-case.  If at all possible, these
+#. should be successive letters in your alphabet.  Do NOT use digits
+#. or control characters.  Do not change or translate anything after
+#. the vertical line.
+#: src/globals.c:80
+msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves"
+
+#. TRANSLATORS: This string is used to display the galaxy map to
+#. screen.  There must be exactly 11 characters before the ASCII
+#. vertical line.  The first ("." in English) is used for empty
+#. space, the second ("+") for outposts, the third ("*") for stars,
+#. the remaining for the eight companies.  Do not change or translate
+#. anything after the vertical line.  Double-width characters ARE
+#. handled correctly.
+#: src/globals.c:92
+msgid ".+*ABCDEFGH|output|MapVals"
+msgstr ".+*ABCDEFGH|output|MapVals"
+
+#. TRANSLATORS: This string is used to display the game moves
+#. (choices).  There must be exactly 20 characters (NUMBER_MOVES)
+#. before the ASCII vertical line.  The first character corresponds
+#. to the first character in the "input|GameMoves" string, and so on.
+#. Do not change or translate anything after the vertical line.
+#. Double-width characters ARE handled correctly.
+#: src/globals.c:103
+msgid "abcdefghijklmnopqrst|output|GameMoves"
+msgstr "abcdefghijklmnopqrst|output|GameMoves"
+
+#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the
+#. Game Winner dialog box at the end of the game.  If ordinals depend
+#. on the gender of the player, it may be simpler to list cardinal
+#. numbers instead (eg, "No. 1").  Up to five characters are allowed
+#. (see ORDINAL_COLS in src/intf.h).
+#: src/globals.c:114
+msgid "1st"
+msgstr "1:a"
+
+#: src/globals.c:115
+msgid "2nd"
+msgstr "2:a"
+
+#: src/globals.c:116
+msgid "3rd"
+msgstr "3:e"
+
+#: src/globals.c:117
+msgid "4th"
+msgstr "4:e"
+
+#: src/globals.c:118
+msgid "5th"
+msgstr "5:e"
+
+#: src/globals.c:119
+msgid "6th"
+msgstr "6:e"
+
+#: src/globals.c:120
+msgid "7th"
+msgstr "7:e"
+
+#: src/globals.c:121
+msgid "8th"
+msgstr "8:e"
+
+#: src/game.c:117 src/game.c:152
+#, c-format
+msgid "Loading game %d... "
+msgstr "Läser in spel %d… "
+
+#: src/game.c:226
+#, c-format
+msgid "  First Player  "
+msgstr "  Första spelare  "
+
+#: src/game.c:227
+#, c-format
+msgid "The first player to go is ^{%ls^}."
+msgstr "Den första spelaren att köra är ^{%ls^}."
+
+#. TRANSLATORS: The keycode <C> should be modified to
+#. match that (or those) specified with msgctxt
+#. "input|ContinueGame".
+#: src/game.c:259
+#, c-format
+msgid "Enter number of players [^{1^}-^{%d^}] or ^{<C>^} to continue a game: "
+msgstr "Ange antal spelare [^{1^}-^{%d^}] eller ^{<F>^} för att fortsätta ett spel: "
+
+#. TRANSLATORS: This string specifies the keycodes used to continue a
+#. game; these must NOT contain any numeric digit from 1 to 9.  The
+#. first character (keyboard input code) is used to print the user's
+#. response if one of those keys is pressed.  Both upper and
+#. lower-case versions should be present.
+#: src/game.c:276
+msgctxt "input|ContinueGame"
+msgid "Cc"
+msgstr "Ff"
+
+#: src/game.c:341 src/move.c:413
+#, c-format
+msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
+msgstr "Ange spelnummer [^{1^}-^{9^}] eller ^{<CTRL><C>^} för att avbryta: "
+
+#: src/game.c:406
+#, c-format
+msgid "Please enter your name: "
+msgstr "Ange ditt namn: "
+
+#: src/game.c:425
+#, c-format
+msgid "Do you need any instructions? [^{Y^}/^{N^}] "
+msgstr "Behöver du instruktioner? [^{J^}/^{N^}] "
+
+#: src/game.c:443
+#, c-format
+msgid "  Enter Player Names  "
+msgstr "  Ange spelarnamn  "
+
+#: src/game.c:451
+#, c-format, range: 1..8
+msgid "Player %d: "
+msgstr "Spelare %d: "
+
+#: src/game.c:529
+#, c-format
+msgid "Does any player need instructions? [^{Y^}/^{N^}] "
+msgstr "Behöver någon spelare instruktioner? [^{J^}/^{N^}] "
+
+#: src/game.c:563
+#, c-format
+msgid "  Game Over  "
+msgstr "  Spelet är slut  "
+
+#: src/game.c:564
+#, c-format
+msgid "The game is over after one turn."
+msgid_plural "The game is over after %d turns."
+msgstr[0] "Spelet är slut efter en omgång."
+msgstr[1] "Spelet är slut efter %d omgångar."
+
+#: src/game.c:575
+#, c-format
+msgid "  Total Value  "
+msgstr "  Totalt värde  "
+
+#: src/game.c:577
+#, c-format
+msgid "Your total value was ^{%N^}."
+msgstr "Ditt totala värde var ^{%N^}."
+
+#: src/game.c:588
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"who is ^[*** BANKRUPT ***^]"
+msgstr ""
+"Vinnaren är ^{%ls^}\n"
+"som är ^[*** BANKRUTT ***^]"
+
+#: src/game.c:591
+#, c-format
+msgid ""
+"The winner is ^{%ls^}\n"
+"with a value of ^{%N^}."
+msgstr ""
+"Vinnaren är ^{%ls^}\n"
+"med ett värde på ^{%N^}."
+
+#: src/game.c:597
+#, c-format
+msgid "  Game Winner  "
+msgstr "  Vinnare av spelet  "
+
+#. TRANSLATORS: "Player" is used as a column title in a
+#. table containing all player names.
+#: src/game.c:606 src/move.c:882
+#, c-format
+msgctxt "subtitle"
+msgid "Player"
+msgstr "Spelare"
+
+#. TRANSLATORS: "Total Value" refers to the total worth
+#. (shares, cash and debt) of any given player.  %ls is the
+#. currency symbol of the current locale.
+#: src/game.c:611
+#, c-format
+msgctxt "subtitle"
+msgid "Total Value (%ls)"
+msgstr "Totalt värde (%ls)"
+
+#: src/game.c:645 src/game.c:695 src/exch.c:100
+#, c-format
+msgid "Player: ^{%ls^}"
+msgstr "Spelare: ^{%ls^}"
+
+#: src/game.c:648
+#, c-format
+msgid "  Turn: ^{%d^}  "
+msgstr "  Omgång: ^{%d^}  "
+
+# Turn vs move
+#: src/game.c:649
+#, c-format
+msgid "  ^[*** Last Turn ***^]  "
+msgstr "  ^[*** Sista omgången ***^]  "
+
+#: src/game.c:693
+#, c-format
+msgid "  Stock Portfolio  "
+msgstr "  Aktieportfölj  "
+
+#. TRANSLATORS: The current player is bankrupt (has no
+#. shares or cash, ie, whose total value is zero)
+#: src/game.c:702
+#, c-format
+msgid "^[* * *   B A N K R U P T   * * *^]"
+msgstr "^[* * *   B A N K R U T T   * * *^]"
+
+#: src/game.c:717 src/exch.c:112
+#, c-format
+msgid "No companies on the map"
+msgstr "Inga företag på kartan"
+
+#. TRANSLATORS: "Company" is a two-line column label in
+#. a table containing a list of companies.
+#: src/game.c:725 src/exch.c:120
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"\n"
+"Company"
+msgstr ""
+"\n"
+"Företag"
+
+#. TRANSLATORS: "Ownership" is a two-line column label
+#. in a table containing the current player's
+#. percentage ownership in any given company.  The
+#. maximum column width is 10 characters (see
+#. OWNERSHIP_COLS in src/intf.h).
+#: src/game.c:732
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Ownership\n"
+"(%%)"
+msgstr ""
+"Ägarskap\n"
+"(%%)"
+
+#. TRANSLATORS: "Holdings" is a two-line column label
+#. in a table containing the number of shares the
+#. current player owns in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_OWNED_COLS in src/intf.h).
+#: src/game.c:739
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Holdings\n"
+"(shares)"
+msgstr ""
+"Innehav\n"
+"(aktier)"
+
+#. TRANSLATORS: "Return" is a two-line column label in
+#. a table containing the share return as a percentage
+#. in any given company.  The maximum column width is
+#. 10 characters (see SHARE_RETURN_COLS in src/intf.h).
+#: src/game.c:746 src/exch.c:141
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Return\n"
+"(%%)"
+msgstr ""
+"Avkastning\n"
+"(%%)"
+
+#. TRANSLATORS: "Price per share" is a two-line column
+#. label in a table containing the price per share in
+#. any given company.  %ls is the currency symbol in
+#. the current locale.  The maximum column width is 12
+#. characters INCLUDING the currency symbol (see
+#. SHARE_PRICE_COLS in src/intf.h).
+#: src/game.c:755 src/exch.c:150
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Price per\n"
+"share (%ls)"
+msgstr ""
+"Pris per\n"
+"aktie (%ls)"
+
+#. TRANSLATORS: The "Total value", "Current cash",
+#. "Current debt" and "Interest rate" labels MUST all be
+#. the same length (ie, right-padded with spaces as
+#. needed) and must have at least one trailing space so
+#. that the display routines work correctly.  The maximum
+#. length of each label is 36 characters.
+#.
+#. Note that some of these labels are used for both the
+#. Player Status window and the Trading Bank window.
+#: src/game.c:796
+#, c-format
+msgctxt "label"
+msgid "Total value:   "
+msgstr "Totalt värde:       "
+
+#: src/game.c:800 src/exch.c:324
+#, c-format
+msgctxt "label"
+msgid "Current cash:  "
+msgstr "Aktuella kontanter: "
+
+#: src/game.c:807 src/exch.c:332
+#, c-format
+msgctxt "label"
+msgid "Current debt:  "
+msgstr "Aktuell skuld:      "
+
+#: src/game.c:813 src/exch.c:337
+#, c-format
+msgctxt "label"
+msgid "Interest rate: "
+msgstr "Räntesats:          "
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and
+#. <CTRL><C>).  The sequences "^{" and "^}" change the
+#. character rendition (attributes) and take up no space.
+#: src/move.c:246 src/exch.c:182
+#, c-format
+msgid "^{<1>^} Display stock portfolio"
+msgstr "^{<1>^} Visa aktieportfölj"
+
+#: src/move.c:248
+#, c-format
+msgid "^{<2>^} Declare bankruptcy"
+msgstr "^{<2>^} Förklara bankrutt"
+
+#: src/move.c:250
+#, c-format
+msgid "^{<3>^} Save and end the game"
+msgstr "^{<3>^} Spara och avsluta spelet"
+
+#: src/move.c:252
+#, c-format
+msgid "^{<CTRL><C>^} Quit the game"
+msgstr "^{<CTRL><C>^} Avsluta spelet"
+
+#. TRANSLATORS: The maximum column width is either 38
+#. characters (including the trailing space), or 76
+#. characters minus the length of the longest of the four
+#. strings above this one.  The sequences "^{", "^}",
+#. "^[" and "^]" do not take up any room.  "%lc" takes up
+#. either one or two columns, depending on the appropriate
+#. "output|GameMoves" string in the current PO file.
+#: src/move.c:263
+#, c-format
+msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+msgstr "Välj drag [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
+
+# Skillnad mellan turn och move?
+#. TRANSLATORS: A game usually consists of
+#. DEFAULT_MAX_TURN (50) turns.  On each
+#. turn, the computer randomly selects
+#. NUMBER_MOVES (20) moves (positions on the
+#. map); each player selects just one move
+#. per turn.  "Move" refers to the player's
+#. choice.
+#: src/move.c:309
+#, c-format
+msgid "Move ^{%lc^}"
+msgstr "Drag ^{%lc^}"
+
+#: src/move.c:330
+#, c-format
+msgid "^{<2>^} (Declare bankruptcy)"
+msgstr "^{<2>^} (Förklara bankrutt)"
+
+#: src/move.c:339
+#, c-format
+msgid "^{<3>^} (Save and end the game)"
+msgstr "^{<3>^} (Spara och avsluta spelet)"
+
+#: src/move.c:360
+#, c-format
+msgid "^{<CTRL><C>^} (Quit the game)"
+msgstr "^{<CTRL><C>^} (Avsluta spelet)"
+
+#: src/move.c:375
+#, c-format
+msgid "Are you sure? [^{Y^}/^{N^}] "
+msgstr "Är du säker? [^{J^}/^{N^}] "
+
+#: src/move.c:392 src/move.c:470
+#, c-format
+msgid "Saving game %d... "
+msgstr "Sparar spel %d… "
+
+#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103
+#, c-format
+msgid "  Bankruptcy Court  "
+msgstr "  Konkursdomstol  "
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:702
+#, c-format
+msgid "%ls has been declared bankrupt by the Interstellar Trading Bank."
+msgstr "%ls har förklarats bankrutt av Interstellära handelsbanken."
+
+#. TRANSLATORS: %ls is the player's name.
+#: src/move.c:710
+#, c-format
+msgid "%ls has declared bankruptcy."
+msgstr "%ls har förklarat sig bankrutt."
+
+#: src/move.c:778
+#, c-format
+msgid "  New Company  "
+msgstr "  Nytt företag  "
+
+#: src/move.c:779
+#, c-format
+msgid ""
+"A new company has been formed!\n"
+"Its name is ^{%ls^}."
+msgstr ""
+"Ett nytt företag har grundats!\n"
+"Dess namn är ^{%ls^}."
+
+#: src/move.c:838
+#, c-format
+msgid ""
+"^{%ls^} has just merged into ^{%ls^}.\n"
+"Please note the following transactions:\n"
+msgstr ""
+"^{%ls^} har slagits samman till ^{%ls^}.\n"
+"Notera följande transaktioner:\n"
+
+#: src/move.c:844
+#, c-format
+msgid "  Company Merger  "
+msgstr "  Företagssammanslagning  "
+
+#. TRANSLATORS: "Old stock" refers to the company that has
+#. just ceased existence due to a merger.
+#.
+#. Note that the "Old stock" and "New stock" labels MUST be
+#. the same length and must contain a trailing space for the
+#. display routines to work correctly.  The maximum length of
+#. each label is 36 characters.
+#: src/move.c:864
+#, c-format
+msgctxt "label"
+msgid "Old stock: "
+msgstr "Gammal aktie: "
+
+#. TRANSLATORS: "New stock" refers to the company that has
+#. absorbed the other due to a merger.
+#: src/move.c:875
+#, c-format
+msgctxt "label"
+msgid "New Stock: "
+msgstr "Ny aktie:     "
+
+#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to
+#. each player after two companies merge.  %ls is the currency
+#. symbol in the current locale.  The maximum column width is
+#. 12 characters INCLUDING the currency symbol (see
+#. MERGE_BONUS_COLS in src/intf.h).
+#: src/move.c:889
+#, c-format
+msgctxt "subtitle"
+msgid "Bonus (%ls)"
+msgstr "Bonus (%ls)"
+
+#. TRANSLATORS: "Total" refers to the total number of shares in
+#. the new company after a merger.  The maximum column width is
+#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h).
+#: src/move.c:894
+#, c-format
+msgctxt "subtitle"
+msgid "Total"
+msgstr "Totalt"
+
+#. TRANSLATORS: "New" refers to how many (new) shares each
+#. player receives in the surviving company after a merger.
+#. The maximum column width is 8 characters (see
+#. MERGE_NEW_STOCK_COLS in src/intf.h).
+#: src/move.c:901
+#, c-format
+msgctxt "subtitle"
+msgid "New"
+msgstr "Nya"
+
+#. TRANSLATORS: "Old" refers to how many shares each player had
+#. in the company ceasing existence.  The maximum column width
+#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h).
+#: src/move.c:907
+#, c-format
+msgctxt "subtitle"
+msgid "Old"
+msgstr "Gamla"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1068
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{All assets have been taken to repay outstanding loans.^}"
+msgstr ""
+"%ls har förklarats bankrutt av Interstellära handelsbanken.\n"
+"\n"
+"^{Alla tillgångar har använts för återbetalning av obetalda lån.^}"
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/move.c:1092
+#, c-format
+msgid ""
+"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
+"\n"
+"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}"
+msgstr ""
+"%ls har förklarats bankrutt av Interstellära handelsbanken.\n"
+"\n"
+"^{Banken har gått med på att betala aktieägare ^}%.2f%%^{ av värdet på varje aktie som ägs.^}"
+
+#. TRANSLATORS: The label "Amount paid per share"
+#. refers to payment made by the Interstellar
+#. Trading Bank to each player upon company
+#. bankruptcy.  This label MUST be the same
+#. length as "Old share value" and MUST have at
+#. least one trailing space for the display
+#. routines to work correctly.  The maximum
+#. length is 28 characters.
+#: src/move.c:1120
+#, c-format
+msgctxt "label"
+msgid "Amount paid per share: "
+msgstr "Betalat per aktie:  "
+
+#. TRANSLATORS: "Old share value" refers to the
+#. share price of a company before it was forced
+#. into bankruptcy by the Bank.  This label must be
+#. the same width as "Amount paid per share".
+#: src/move.c:1128
+#, c-format
+msgctxt "label"
+msgid "Old share value:       "
+msgstr "Gammalt aktievärde: "
+
+#: src/move.c:1211 src/move.c:1246 src/exch.c:321
+#, c-format
+msgid "  Interstellar Trading Bank  "
+msgstr "  Interstellära handelsbanken  "
+
+#: src/move.c:1213
+#, c-format
+msgid ""
+"You were forced to borrow %N\n"
+"to cover losses from company shares."
+msgstr ""
+"Du blev tvungen att låna %N\n"
+"för att täcka förluster från företagsaktier."
+
+#: src/move.c:1248
+#, c-format
+msgid ""
+"Your debt has amounted to %N!\n"
+"^{The Bank has impounded ^}%N^{ from your cash.^}"
+msgstr ""
+"Din skuld har uppgått till %N!\n"
+"^{Banken har beslagtagit ^}%N^{ från dina kontanter.^}"
+
+#: src/exch.c:98
+#, c-format
+msgid "  Interstellar Stock Exchange  "
+msgstr "  Interstellär aktiemarknad  "
+
+#. TRANSLATORS: "Shares left" is a two-line column
+#. label in a table containing the number of shares
+#. left to be purchased in any given company.  The
+#. maximum column width is 10 characters (see
+#. STOCK_LEFT_COLS in src/intf.h).
+#: src/exch.c:127
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"left"
+msgstr ""
+"Aktier\n"
+"kvar"
+
+#. TRANSLATORS: "Shares issued" is a two-line column
+#. label in a table containing the number of shares
+#. already sold (ie, bought by all players) in any
+#. given company.  The maximum column width is 10
+#. characters (see STOCK_ISSUED_COLS in src/intf.h).
+#: src/exch.c:134
+#, c-format
+msgctxt "subtitle"
+msgid ""
+"Shares\n"
+"issued"
+msgstr ""
+"Aktier\n"
+"utfärdade"
+
+#. TRANSLATORS: Each label may be up to 37 characters wide
+#. (for <1> and <2>) or 38 characters wide (for <3> and <4>).
+#: src/exch.c:186
+#, c-format
+msgid "^{<2>^} Display galaxy map"
+msgstr "^{<2>^} Visa galaxkarta"
+
+#: src/exch.c:188
+#, c-format
+msgid "^{<3>^} Visit the Trading Bank"
+msgstr "^{<3>^} Besök handelsbanken"
+
+#: src/exch.c:190
+#, c-format
+msgid "^{<4>^} Exit the Stock Exchange"
+msgstr "^{<4>^} Gå ut från aktiemarknaden"
+
+#: src/exch.c:193
+#, c-format
+msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: "
+msgstr "Ange val [^[Företagsbokstav^]/^{1^}-^{4^}]: "
+
+#. TRANSLATORS: The "Total value", "Current cash", "Current
+#. debt", "Interest rate" and "Credit limit" labels MUST all be
+#. the same length (ie, right-padded with spaces as needed) and
+#. must have at least one trailing space so that the display
+#. routines work correctly.  The maximum length of each label
+#. is 36 characters.
+#.
+#. Note that some of these labels are used for both the Player
+#. Status window and the Trading Bank window.
+#: src/exch.c:351
+#, c-format
+msgctxt "label"
+msgid "Credit limit:  "
+msgstr "Kreditgräns:        "
+
+#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit
+#. from the Bank" menu options must all be the same length
+#. (ie, padded with trailing spaces as required).  The maximum
+#. length is 72 characters.
+#: src/exch.c:366
+#, c-format
+msgid "^{<1>^} Borrow money      "
+msgstr "^{<1>^} Låna pengar      "
+
+#: src/exch.c:368
+#, c-format
+msgid "^{<2>^} Repay debt        "
+msgstr "^{<2>^} Återbetala skuld "
+
+#: src/exch.c:370
+#, c-format
+msgid "^{<3>^} Exit from the Bank"
+msgstr "^{<3>^} Gå ut från banken"
+
+#: src/exch.c:373
+#, c-format
+msgid "Enter selection [^{1^}-^{3^}]: "
+msgstr "Ange val [^{1^}-^{3^}]: "
+
+#: src/exch.c:426
+#, c-format
+msgid "  Insufficient Credit Limit  "
+msgstr "  Otillräcklig kreditgräns  "
+
+#: src/exch.c:427
+#, c-format
+msgid "The Bank will not lend you any more money."
+msgstr "Banken kommer inte låna dig mer pengar."
+
+#: src/exch.c:447
+#, c-format
+msgid "How much do you wish to borrow? "
+msgstr "Hur mycket vill du låna? "
+
+#: src/exch.c:479
+#, c-format
+msgid "  No Debt  "
+msgstr "  Ingen skuld  "
+
+#: src/exch.c:480
+#, c-format
+msgid "You have no debt to repay."
+msgstr "Du har ingen skuld att återbetala."
+
+#: src/exch.c:484
+#, c-format
+msgid "  No Cash  "
+msgstr "  Inga kontanter  "
+
+#: src/exch.c:485
+#, c-format
+msgid "You have no cash with which to repay the debt!"
+msgstr ""
+"Du har inga kontanter att\n"
+"återbetala skulden med!"
+
+#: src/exch.c:505
+#, c-format
+msgid "How much do you wish to repay? "
+msgstr "Hur mycket vill du återbetala? "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:581
+#, c-format
+msgid "  Stock Transaction in %ls  "
+msgstr "  Aktieöverföring i %ls  "
+
+#. TRANSLATORS: "Shares issued" represents the number of
+#. shares already sold by the company to all players.
+#.
+#. Note that the labels "Shares issued", "Shares left",
+#. "Price per share" and "Return" must all be the same length
+#. and must have at least one trailing space for the output
+#. routines to work correctly.  The maximum length of each
+#. label is 22 characters.
+#: src/exch.c:592
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares issued:   "
+msgstr "Aktier utfärdade: "
+
+#. TRANSLATORS: "Shares left" is the number of shares that are
+#. left to be purchased in the current company.
+#: src/exch.c:600
+#, c-format
+msgctxt "label|Stock A"
+msgid "Shares left:     "
+msgstr "Aktier kvar:      "
+
+#. TRANSLATORS: "Price per share" is the cost of each share in
+#. the current company.
+#: src/exch.c:607
+#, c-format
+msgctxt "label|Stock A"
+msgid "Price per share: "
+msgstr "Pris per aktie:   "
+
+# Return on investment?
+#. TRANSLATORS: "Return" is the share return as a percentage.
+#: src/exch.c:613
+#, c-format
+msgctxt "label|Stock A"
+msgid "Return:          "
+msgstr "Avkastning:       "
+
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
+#.
+#. Note that the labels "Current holdings", "Percentage owned"
+#. and "Current cash" MUST all be the same length and contain at
+#. least one trailing space for the display routines to work
+#. correctly.  The maximum length of each label is 18
+#. characters.
+#: src/exch.c:626
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current holdings: "
+msgstr "Aktuellt innehav:   "
+
+#. TRANSLATORS: "Percentage owned" is the current player's
+#. percentage ownership in this particular company.
+#: src/exch.c:636
+#, c-format
+msgctxt "label|Stock B"
+msgid "Percentage owned: "
+msgstr "Procent ägt:        "
+
+#: src/exch.c:641
+#, c-format
+msgctxt "label|Stock B"
+msgid "Current cash:     "
+msgstr "Aktuella kontanter: "
+
+#. TRANSLATORS: Each label may be up to 35 characters wide
+#. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
+#: src/exch.c:654
+#, c-format
+msgid "^{<1>^} Buy stock from company"
+msgstr "^{<1>^} Köp aktier från företag"
+
+#: src/exch.c:656
+#, c-format
+msgid "^{<2>^} Sell stock back to company"
+msgstr "^{<2>^} Återsälj aktier till företag"
+
+#: src/exch.c:658
+#, c-format
+msgid "^{<3>^} Bid company to issue more shares"
+msgstr "^{<3>^} Be företag utfärda fler aktier"
+
+#: src/exch.c:660
+#, c-format
+msgid "^{<4>^} Exit to the Stock Exchange"
+msgstr "^{<4>^} Gå ut till aktiemarknaden"
+
+#: src/exch.c:663
+#, c-format
+msgid "Enter selection [^{1^}-^{4^}]: "
+msgstr "Ange val [^{1^}-^{4^}]: "
+
+#: src/exch.c:719
+#, c-format
+msgid "  No Shares Available  "
+msgstr "  Inga aktier tillgängliga  "
+
+#: src/exch.c:720
+#, c-format
+msgid "No more shares are available for purchase."
+msgstr "Inga fler aktier finns tillgängliga för inköp."
+
+#: src/exch.c:724
+#, c-format
+msgid "  Insufficient Cash  "
+msgstr "  Otillräckliga kontanter  "
+
+#: src/exch.c:725
+#, c-format
+msgid ""
+"You do not have enough cash\n"
+"to purchase additional shares."
+msgstr ""
+"Du har för lite kontanter för\n"
+"att köpa ytterligare aktier."
+
+#: src/exch.c:736
+#, c-format
+msgid "You can purchase ^{one^} share."
+msgid_plural "You can purchase up to ^{%'ld^} shares."
+msgstr[0] "Du kan köpa ^{en^} aktie."
+msgstr[1] "Du kan köpa upp till ^{%'ld^} aktier."
+
+#: src/exch.c:742
+#, c-format
+msgid "How many shares do you wish to purchase? "
+msgstr "Hur många aktier vill du köpa? "
+
+#: src/exch.c:763
+#, c-format
+msgid "  No Shares  "
+msgstr "  Inga aktier  "
+
+#: src/exch.c:764
+#, c-format
+msgid "You do not have any shares to sell."
+msgstr "Du har inga aktier att sälja."
+
+#: src/exch.c:771
+#, c-format
+msgid "You can sell ^{one^} share."
+msgid_plural "You can sell up to ^{%'ld^} shares."
+msgstr[0] "Du kan sälja ^{en^} aktie."
+msgstr[1] "Du kan sälja upp till ^{%'ld^} aktier."
+
+#: src/exch.c:777
+#, c-format
+msgid "How many shares do you wish to sell? "
+msgstr "Hur många aktier vill du sälja? "
+
+#: src/exch.c:805
+#, c-format
+msgid "  No Shares Issued  "
+msgstr "  Inga aktier utfärdade  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:807
+#, c-format
+msgid ""
+"%ls has refused\n"
+"to issue more shares."
+msgstr ""
+"%ls har vägrat\n"
+"att utfärda fler aktier."
+
+#: src/exch.c:812
+#, c-format
+msgid "  Shares Issued  "
+msgstr "  Aktier utfärdade  "
+
+#. TRANSLATORS: %ls represents the company name.
+#: src/exch.c:814
+#, c-format
+msgid ""
+"%ls has issued\n"
+"^{one^} more share."
+msgid_plural ""
+"%ls has issued\n"
+"^{%'ld^} more shares."
+msgstr[0] ""
+"%ls har utfärdat\n"
+"^{en^} till aktie."
+msgstr[1] ""
+"%ls har utfärdat\n"
+"^{%'ld^} till aktier."
+
+#: src/fileio.c:43 src/fileio.c:83 src/fileio.c:126 src/fileio.c:387
+#, c-format
+msgid "%s: missing field on line %d"
+msgstr "%s: saknat fält på rad %d"
+
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
+#, c-format
+msgid "%s: illegal field on line %d"
+msgstr "%s: ogiltigt fält på rad %d"
+
+#: src/fileio.c:51
+#, c-format
+msgid "%s: illegal field on line %d: `%s'"
+msgstr "%s: ogiltigt fält på rad %d: ”%s”"
+
+#: src/fileio.c:55
+#, c-format
+msgid "%s: illegal value on line %d: `%s'"
+msgstr "%s: ogiltigt värde på rad %d: ”%s”"
+
+#: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
+#, c-format
+msgid "%s: illegal value on line %d"
+msgstr "%s: ogiltigt värde på rad %d"
+
+#: src/fileio.c:98
+#, c-format
+msgid "%s: illegal characters on line %d"
+msgstr "%s: ogiltigt tecken på rad %d"
+
+#: src/fileio.c:183
+#, c-format
+msgid "%s: could not convert string"
+msgstr "%s: kunde inte konvertera sträng"
+
+#: src/fileio.c:257
+#, c-format
+msgid "  Game Not Found  "
+msgstr "  Spel ej funnet  "
+
+#: src/fileio.c:258
+#, c-format
+msgid "Game %d has not been saved to disk."
+msgstr "Spel %d har inte sparats till disk."
+
+#: src/fileio.c:265
+#, c-format
+msgid "  Game Not Loaded  "
+msgstr "  Spel ej inläst  "
+
+#: src/fileio.c:266
+#, c-format
+msgid ""
+"Game %d could not be loaded from disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spel %d kunde inte läsas in från disk.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#: src/fileio.c:319
+#, c-format
+msgid "%s: missing header in game file"
+msgstr "%s: saknar rubrik i spelfil"
+
+#: src/fileio.c:322
+#, c-format
+msgid "%s: not a valid game file"
+msgstr "%s: inte en giltig spelfil"
+
+#: src/fileio.c:325 src/fileio.c:332
+#, c-format
+msgid "%s: missing subheader in game file"
+msgstr "%s: saknar underrubrik i spelfil"
+
+#: src/fileio.c:328
+#, c-format
+msgid "%s: saved under a different version of Star Traders"
+msgstr "%s: sparat under en annan version av Star Traders"
+
+#: src/fileio.c:335
+#, c-format
+msgid "%s: saved under an incompatible character encoding"
+msgstr "%s: sparat med en inkompatibel teckenkodning"
+
+#: src/fileio.c:343
+#, c-format
+msgid "%s: illegal or missing field on line %d"
+msgstr "%s: ogiltigt eller saknat fält på rad %d"
+
+#: src/fileio.c:479 src/fileio.c:501
+#, c-format
+msgid "  Game Not Saved  "
+msgstr "  Spel ej sparat  "
+
+#: src/fileio.c:480
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{Directory %s: %s^}"
+msgstr ""
+"Spel %d kunde inte sparas till disk.\n"
+"\n"
+"^{Katalog %s: %s^}"
+
+#: src/fileio.c:502
+#, c-format
+msgid ""
+"Game %d could not be saved to disk.\n"
+"\n"
+"^{File %s: %s^}"
+msgstr ""
+"Spel %d kunde inte sparas till disk.\n"
+"\n"
+"^{Fil %s: %s^}"
+
+#. TRANSLATORS: The help text for Star Traders is marked up using a
+#. custom mark-up format NOT used anywhere else in the source code.
+#.
+#. Each string is a single page of text that is displayed in an area 76
+#. columns wide by 16 lines high.  Each line is delimited by "\n".  NO
+#. word-wrapping is performed: you must place the "\n" characters in the
+#. appropriate place.  Ideally, each line within the string should be
+#. also (manually) space-justified or centred.  TAB characters and other
+#. control codes must NOT be used.  If a string starts with "@" as the
+#. very first character, that string is ignored (as are all strings
+#. following): this allows a variable number of help text pages (from
+#. one to ten).  Multibyte strings are handled correctly (even those
+#. requiring shift sequences!).
+#.
+#. The ASCII circumflex accent character "^" switches to a different
+#. character rendition (also called attributes), depending on the
+#. character following the "^":
+#.
+#. ^^ - Print the circumflex accent (ASCII code U+005E)
+#. ^N - Switch to using the normal character rendition
+#. ^B - Switch to using the bold character rendition
+#. ^H - Switch to using the highlight character rendition
+#. ^K - Switch to using the keycode character rendition (such as used for "<CTRL><C>")
+#. ^e - Switch to using the character rendition used for empty space
+#. ^o - Switch to using the character rendition used for outposts
+#. ^s - Switch to using the character rendition used for stars
+#. ^c - Switch to using the character rendition used for companies
+#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map
+#.
+#. The help text parsing routines also understand the following "value
+#. escapes" introduced by the ASCII tilde character "~"; these act like
+#. "%" conversion specifiers in printf():
+#.
+#. ~~       - Print the tilde character (ASCII code U+007E) [*]
+#. ~x       - Print the width of the galaxy map (MAX_X) [**]
+#. ~y       - Print the height of the galaxy map (MAX_Y) [**]
+#. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
+#. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
+#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
+#. ~M       - Print the keycode for the last choice of move [***]
+#. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
+#. ~.       - Print the character used to represent empty space on the map [***]
+#. ~+       - Print the character used to represent outposts on the map [***]
+#. ~*       - Print the character used to represent stars on the map [***]
+#.
+#. [*]   Takes one character space (column space) in the output
+#. [**]  Takes two column spaces in the output
+#. [***] Takes one or two column spaces in the output, depending on the
+#. appropriate strings in the current PO file.
+#.
+#. Note that all keycodes and map representation characters use locale-
+#. specific characters; double-width characters ARE supported.  Note
+#. also that the tilde value escapes do NOT change the current character
+#. rendition: a circumflex accent escape is needed for that.  For
+#. example, to display the first choice of move as it would be shown on
+#. the galaxy map, use something like "^k~1^N" (a six-character sequence
+#. that would translate to just one character (or maybe two) in the
+#. output text).
+#.
+#. Formatting the help text is probably the most complicated and tedious
+#. part of translating Star Traders.  The author and maintainer of this
+#. game is more than happy to help you with this task: if you are able
+#. to provide a translation, even if it is not formatted correctly, the
+#. maintainer will perform the necessary adjustments for word-wrapping
+#. and justification.  In addition, remember that you have up to 10
+#. pages in which to display your help text: the translation does not
+#. need to correspond exactly to the original text.  This text will not
+#. be changing any time soon!
+#.
+#: src/help.c:113
+msgid ""
+"^BStar Traders^N  is a simple game  of  interstellar trading.  The object of the\n"
+"game is to amass  the greatest amount  of wealth  possible.  This is done by\n"
+"creating interstellar  shipping lanes, expanding them  and buying shares  in\n"
+"the companies  controlling  them.  Shares  appreciate  in value  as  company\n"
+"operations expand.  In addition, the return  on each share (as a percentage)\n"
+"also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
+"finance additional purchases on the Stock Exchange.\n"
+"\n"
+"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"of it may be:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represents ^Bempty space^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represents a ^Bstar^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+msgstr ""
+"^BStar Traders^N  är ett enkelt spel  om interstellär handel.  Målet i spelet är\n"
+"att samla sig på största möjliga rikedom.  Detta görs genom att skapa inter-\n"
+"stellära transportrutter, utöka dem och köpa aktier i företagen som kontrol-\n"
+"lerar dem.  Aktier ökar i värde  då företagens verksamhet expanderar.  Dess-\n"
+"utom ändras även avkastningen på varje aktie (i procent).  Spelare kan också\n"
+"låna från  den  interstellära handelsbanken  för att finansiera  ytterligare\n"
+"inköp på aktiemarknaden.\n"
+"\n"
+"Kartan över galaxen  representeras av ett rutnät  med storleken ^B~x^N x ^B~y^N.  En\n"
+"typisk del av den kan vara:\n"
+"\n"
+"        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N representerar ^Btom rymd^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N representerar en ^Bstjärna^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+
+#: src/help.c:132
+msgid ""
+"The computer selects ^B~m^N moves  (labeled ^k~1^N to ^k~M^N)  at random, and places these\n"
+"on the map.  To select  any of the highlighted positions, press that letter.\n"
+"For example, some of the moves on the map may be:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Moves ^k~1^N to ^k~5^N shown.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Selecting a position  that is  ^Bnot^N  next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n"
+"will set up  an ^Boutpost^N,  not belonging  to any company.  Thus, if move ^k~3^N is\n"
+"selected on the above map, a ^o ~+ ^N would be placed at that position.\n"
+msgstr ""
+"Datorn väljer slumpmässigt ^B~m^N drag (märkta ^k~1^N till ^k~M^N),  och placerar dessa på\n"
+"kartan.  Tryck motsvarande bokstav för att välja någon av de markerade posi-\n"
+"tionerna.  Till exempel kan några av dragen på kartan vara:\n"
+"\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N        Drag ^k~1^N till ^k~5^N visade.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n"
+"\n"
+"\n"
+"Att välja en position  som ^Binte^N är intill en stjärna  (som dragen ^k~1^N, ^k~3^N eller\n"
+"^k~5^N) kommer skapa en ^Butpost^N  som inte tillhör  något företag.  Om drag ^k~3^N väljs\n"
+"på kartan ovan så kommer ett ^o ~+ ^N placeras på den positionen.\n"
+
+#: src/help.c:150
+msgid ""
+"If, on the other hand, a position  next to  a star  (or another outpost)  is\n"
+"selected, a ^Bcompany^N would be formed  and its letter would appear on the map.\n"
+"As a reward for creating the company, you are granted the first five shares.\n"
+"Up to ^B~c^N companies can be created in this way.\n"
+"\n"
+"If a position  next to  an existing company  is selected, the company  would\n"
+"expand its operations  by one square.  This increases the cost of its shares\n"
+"and hence  your return.  Thus,  if the map  was as shown below,  selecting ^k~6^N\n"
+"or ^k~8^N increases Company ^B~B^N's shipping lane:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+msgstr ""
+"Om å andra sidan  en position intill en stjärna  (eller annan utpost)  väljs\n"
+"kommer ett ^Bföretag^N skapas,  och dess bokstav dyker upp på kartan.  Som belö-\n"
+"ning för att ha grundat företaget får du de fem första aktierna.  Upp till ^B~c^N\n"
+"företag kan skapas på detta sätt.\n"
+"\n"
+"Om en position  intill ett  existerande företag  väljs kommer  företaget öka\n"
+"sitt område med en ruta.  Detta ökar  priset på dess aktier  och därmed  din\n"
+"avkastning.  Följaktligen, om kartan ser  ut som nedan, bygger valet ^k~6^N eller\n"
+"^k~8^N ut företag ^B~B^N:s transportrutt:\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Drag ^k~6^N eller ^k~8^N ökar företag ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+
+#: src/help.c:168
+msgid ""
+"Selecting positions next to stars increases the value of your stock by about\n"
+"five times as much  as an extension  not next to a star.  Thus move ^k~6^N should\n"
+"be preferred to move ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~6^N is preferred to ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"You may also expand  any company  by selecting positions  next to  outposts.\n"
+"Such outposts  will be swallowed up  by  that company.  Thus,  move  ^k~1^N  will\n"
+"extend  Company ^B~C^N by ^Btwo^N squares.  As a bonus,  outposts  next to  stars are\n"
+"more valuable:  the company's share price  will increase by a greater amount\n"
+"than it would for outposts not next to stars.\n"
+msgstr ""
+"Att välja positioner intill stjärnor  ökar värdet av dina aktier ungefär fem\n"
+"gånger så mycket som en utökning inte intill en stjärna.  Därför skulle drag\n"
+"^k~6^N föredras framför drag ^k~8^N.\n"
+"\n"
+"        ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N        Drag ^k~6^N föredras framför ^k~8^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n"
+"\n"
+"Du kan också utöka  ett företag genom att välja positioner  intill utposter.\n"
+"Sådana utposter kommer tas upp av det företaget.  Därför kommer drag ^k~1^N utöka\n"
+"företag ^B~C^N med ^Btvå^N rutor.   Som en bonus är utposter intill stjärnor mer vär-\n"
+"defulla:  företagets aktiepris kommer öka  med mer än vad det skulle för ut-\n"
+"poster som ej ligger intill stjärnor.\n"
+
+#: src/help.c:186
+msgid ""
+"If two companies  are separated on the map by only one square, then they can\n"
+"be ^Bmerged^N into  one company  by selecting that position (if available).  For\n"
+"example, on the map below, companies ^B~A^N and ^B~B^N  can be merged  by selecting ^k~5^N.\n"
+"When this occurs, the company  with the greater assets value  takes over the\n"
+"other one.  Here, Company ^B~B^N might take over  Company ^B~A^N.  Company ^B~A^N ceases to\n"
+"exist, although it may reappear as an entirely new company at a later stage.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"        ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n"
+"\n"
+"When  companies  merge, players are granted  shares in the  dominant company\n"
+"proportional to the amount  owned in the old company.  As well, a cash bonus\n"
+"is also paid, proportional to the percentage of the old company owned.\n"
+msgstr ""
+"Om två företag skiljs åt på kartan av endast en ruta kan de ^Bslås samman^N till\n"
+"ett företag genom att välja den positionen  (om tillgänglig).   Till exempel\n"
+"kan på kartan  nedan  företagen ^B~A^N och ^B~B^N  slås samman genom  att välja ^k~5^N.  Då\n"
+"detta sker tar företaget med större tillgångsvärde  över det andra.  Här tar\n"
+"företag ^B~B^N kanske över företag ^B~A^N.  Företag ^B~A^N slutar att existera  men det kan\n"
+"dyka upp på nytt som ett helt nytt företag senare.\n"
+"\n"
+"        ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
+"        ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n"
+"        ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N        Drag ^k~5^N slår samman företagen ^B~A^N och ^B~B^N.\n"
+"        ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n"
+"\n"
+"När företag slås samman tilldelas spelare aktier i det dominerande företaget\n"
+"i proportion till mängden  ägd i det gamla företaget.  En kontantbonus beta-\n"
+"las också ut proportionellt till den ägda procentandelen  av det gamla före-\n"
+"taget.\n"
+
+#: src/help.c:205
+msgid ""
+"Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
+"you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
+"some of your debt (if applicable).  Note that each company  issues a limited\n"
+"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"for more shares to be issued.  You have a better chance of succeeding if you\n"
+"own a larger proportion of the company.\n"
+"\n"
+"The game usually ends after ^B~t^N turns.  However, you may  end the game sooner\n"
+"by pressing  ^K<CTRL><C>^N  when asked  to select  a move.  As  well, individual\n"
+"players can declare themselves bankrupt at  any time.  If your debt is large\n"
+"enough, the Bank  may do this for you!  If you  do not complete your game in\n"
+"the time you have available, you may save the game and continue it later.\n"
+"\n"
+"\n"
+"The ^Bwinner of the game^N  is the person  with the greatest  net  worth  (total\n"
+"value of cash, stock and debt).  ^HGood luck^N and may the best person win!\n"
+msgstr ""
+"När du valt ditt drag går du in i ^BInterstellära aktiemarknaden^N.   Här kan du\n"
+"köpa aktier, sälja dem,  låna från handelsbanken eller betala tillbaka delar\n"
+"av din skuld  (om du har någon).  Notera att varje  företag utfärdar ett be-\n"
+"gränsat antal aktier -- du kan inte köpa  för alltid!  Du kan dock be om ut-\n"
+"färdande av mer aktier.  Du har större chans att lyckas om du äger en större\n"
+"del av företaget.\n"
+"\n"
+"Spelet slutar vanligen efter ^B~t^N omgångar.   Du kan dock avsluta spelet tidi-\n"
+"gare genom att trycka ^K<CTRL><C>^N när du frågas om ett drag.  Enskilda spelare\n"
+"kan förklara sig bankrutt när som helst.   Om din skuld är stor nog kan ban-\n"
+"ken göra detta åt dig!   Om du inte slutför spelet  på den tid du  har till-\n"
+"gänglig kan du spara spelet och fortsätta det senare.\n"
+"\n"
+"^BSpelets vinnare^N  är personen med det största egna kapitalet  (totalt värde i\n"
+"kontanter, aktier och skulder).  ^HLycka till^N och må bästa person vinna!\n"
+
+#: src/help.c:225
+msgid "@ Help text, page 7\n"
+msgstr "@ Hjälptext, sida 7\n"
+
+#: src/help.c:226
+msgid "@ Help text, page 8\n"
+msgstr "@ Hjälptext, sida 8\n"
+
+#: src/help.c:227
+msgid "@ Help text, page 9\n"
+msgstr "@ Hjälptext, sida 9\n"
+
+#: src/help.c:228
+msgid "@ Help text, page 10\n"
+msgstr "@ Hjälptext, sida 10\n"
+
+#: src/help.c:280
+#, c-format
+msgid "  How to Play  "
+msgstr "  Hur man spelar  "
+
+#. TRANSLATORS: The first %d is the current page number,
+#. the second is the number of pages your help text takes
+#. (6, in English).  You can replace the second %d with a
+#. fixed word, if you like.
+#: src/help.c:286
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sida %d av %d"
+
+# Väljer RETUR för att motverka platsbrist
+#. TRANSLATORS: The reason the user is not asked "Press any
+#. key to continue" is historical: many, many people used to
+#. ask "where is the <ANY> key?" :-)
+#: src/help.c:487 src/intf.c:3035
+#, c-format
+msgid "[ Press <SPACE> to continue ] "
+msgstr "[ Tryck <RETUR> för att fortsätta ] "
+
+# Väljer RETUR för att motverka platsbrist
+#. TRANSLATORS: The specific use of <SPACE> and <BACKSPACE>
+#. is not essential: you can use <DEL>, <PAGE-UP>, <UP>,
+#. <LEFT> or <BACK-TAB> instead of <BACKSPACE>, and almost
+#. any other key instead of <SPACE> (other than <ESC>,
+#. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
+#. Note that the maximum label length is 76 characters,
+#. including the trailing space.
+#: src/help.c:495
+#, c-format
+msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
+msgstr "[ Tryck <RETUR> för att fortsätta eller <BACKSTEG> för föregående sida ] "
+
+#: src/intf.c:110
+#, c-format
+msgid "%s: string has incorrect format: `%s'"
+msgstr "%s: sträng har felaktigt format: ”%s”"
+
+#: src/intf.c:126
+#, c-format
+msgid "%s: character has illegal width: `%lc'"
+msgstr "%s: tecken har ogiltig bredd: ”%lc”"
+
+#: src/intf.c:434
+#, c-format
+msgid "terminal size is too small (%d x %d required)"
+msgstr "terminalstorlek är för liten (%d x %d krävs)"
+
+#: src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: src/intf.c:1265
+#, c-format
+msgid "mkchstr_conv: NUL"
+msgstr "mkchstr_conv: NUL"
+
+#: src/intf.c:1568
+#, c-format
+msgid "mkchstr: `%s'"
+msgstr "mkchstr: ”%s”"
+
+#. TRANSLATORS: This string specifies the keycodes used to insert the
+#. default value into the input string, if entered as the very first
+#. character.  Ideally, it should contain an easily-accessible
+#. keycode that would NOT be used in ordinary input.  Digits, ".",
+#. ",", "+" and "-" are definitely NOT acceptable.
+#: src/intf.c:2020
+msgctxt "input|DefaultValue"
+msgid "=;"
+msgstr "=;"
+
+#: src/intf.c:2034 src/intf.c:2079
+#, c-format
+msgid "gettxline: illegal character in string: `%ls'"
+msgstr "gettxline: ogiltigt tecken i sträng: ”%ls”"
+
+#. TRANSLATORS: The strings with msgctxt "input|Yes" and
+#. "input|No" contain the keycodes used to determine whether a
+#. user is answering "Yes" or "No" in response to some question.
+#. Both upper and lower-case versions should be present.
+#: src/intf.c:2952
+msgctxt "input|Yes"
+msgid "Yy"
+msgstr "JjYy"
+
+#: src/intf.c:2954
+msgctxt "input|No"
+msgid "Nn"
+msgstr "Nn"
+
+#. TRANSLATORS: The strings "Yes" and "No" are printed as a
+#. response to user input in answer to questions like "Are you
+#. sure? [Y/N] "
+#: src/intf.c:3005
+msgctxt "answer"
+msgid "Yes"
+msgstr "Ja"
+
+#: src/intf.c:3007
+msgctxt "answer"
+msgid "No"
+msgstr "Nej"
+
+#: src/utils.c:378 src/utils.c:399
+#, c-format
+msgid "%s: "
+msgstr "%s: "
+
+#: src/utils.c:404
+msgid ": "
+msgstr ": "
+
+#: src/utils.c:417
+#, c-format
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: src/utils.c:1041
+#, c-format
+msgid "xmbstowcs: `%s'"
+msgstr "xmbstowcs: ”%s”"
+
+#: src/utils.c:1081
+#, c-format
+msgid "xwcrtomb: NUL"
+msgstr "xwcrtomb: NUL"
+
+#: src/utils.c:1086
+#, c-format
+msgid "xwcrtomb: `%lc'"
+msgstr "xwcrtomb: ”%lc”"
+
+#: lib/getopt.c:575 lib/getopt.c:604
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:"
+
+#: lib/getopt.c:619
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: flaggan ”%s” är tvetydig\n"
+
+#: lib/getopt.c:654 lib/getopt.c:658
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”--%s” tar inget argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:672
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”%c%s” tar inget argument\n"
+
+#: lib/getopt.c:715 lib/getopt.c:734
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: flaggan ”--%s” kräver ett argument\n"
+
+#: lib/getopt.c:772 lib/getopt.c:775
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: okänd flagga ”--%s”\n"
+
+#: lib/getopt.c:783 lib/getopt.c:786
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: okänd flagga ”%c%s”\n"
+
+#: lib/getopt.c:835 lib/getopt.c:838
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ogiltig flagga -- ”%c”\n"
+
+#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
+
+#: lib/getopt.c:964 lib/getopt.c:980
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: flaggan ”-W %s” är tvetydig\n"
+
+#: lib/getopt.c:1004 lib/getopt.c:1022
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”-W %s” tar inget argument\n"
+
+#: lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flaggan ”-W %s” kräver ett argument\n"

From b6a7a80cd9976307be485afefc3109145d480022 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 13 Dec 2016 08:41:37 +1100
Subject: [PATCH 24/99] Update ignored files for the latest version of Gnulib

---
 .gitignore           | 15 ---------------
 build-aux/.gitignore | 15 +++++++++++++++
 lib/.gitignore       |  2 ++
 m4/.gitignore        |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 build-aux/.gitignore

diff --git a/.gitignore b/.gitignore
index b18d09d..d43f501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,21 +15,6 @@ TAGS
 /configure
 /stamp-h1
 
-/build-aux/ar-lib
-/build-aux/compile
-/build-aux/config.guess
-/build-aux/config.rpath
-/build-aux/config.sub
-/build-aux/depcomp
-/build-aux/install-sh
-/build-aux/missing
-
-/build-aux/snippet/_Noreturn.h
-/build-aux/snippet/arg-nonnull.h
-/build-aux/snippet/c++defs.h
-/build-aux/snippet/unused-parameter.h
-/build-aux/snippet/warn-on-use.h
-
 /data/trader.desktop
 
 /po/POTFILES
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
index 0000000..9f9d26a
--- /dev/null
+++ b/build-aux/.gitignore
@@ -0,0 +1,15 @@
+/ar-lib
+/compile
+/config.guess
+/config.rpath
+/config.sub
+/depcomp
+/install-sh
+/missing
+
+/snippet/
+/snippet/_Noreturn.h
+/snippet/arg-nonnull.h
+/snippet/c++defs.h
+/snippet/unused-parameter.h
+/snippet/warn-on-use.h
diff --git a/lib/.gitignore b/lib/.gitignore
index 1ec947c..f8e8179 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -26,6 +26,7 @@ Makefile.am
 /iconv_open-osf.gperf
 /iconv_open-solaris.gperf
 /iconv_open.c
+/limits.in.h
 /localcharset.c
 /localcharset.h
 /locale.in.h
@@ -103,6 +104,7 @@ Makefile.am
 
 /sys/
 
+/unistr/
 /unistr/.dirstamp
 /unistr/u8-mbtoucr.c
 /unistr/u8-uctomb-aux.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 99b0141..2c36b31 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -34,6 +34,7 @@
 /lib-link.m4
 /lib-prefix.m4
 /libunistring-base.m4
+/limits-h.m4
 /localcharset.m4
 /locale-fr.m4
 /locale-ja.m4

From 2601056f0d70155ccd679e521c27bbf07ab431a7 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 13 Dec 2016 08:48:43 +1100
Subject: [PATCH 25/99] Update ignored files to include those generated during
 configure

---
 lib/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/.gitignore b/lib/.gitignore
index f8e8179..d0227fe 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -86,10 +86,12 @@ Makefile.am
 /iconv_open-irix.h
 /iconv_open-osf.h
 /iconv_open-solaris.h
+/limits.h
 /locale.h
 /ref-add.sed
 /ref-del.sed
 /stddef.h
+/stdint.h
 /stdio.h
 /stdlib.h
 /string.h

From 2f79514910f0f5aba80bec914c9c868634f90b11 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sun, 14 May 2017 06:29:44 +1000
Subject: [PATCH 26/99] Update the copyright date to 2017

---
 COPYING          | 2 +-
 INSTALL          | 2 +-
 Makefile.am      | 2 +-
 NEWS             | 2 +-
 README           | 4 ++--
 build-aux/README | 2 +-
 configure.ac     | 2 +-
 data/Makefile.am | 2 +-
 data/README      | 2 +-
 doc/Makefile.am  | 2 +-
 doc/README       | 2 +-
 doc/trader.6     | 6 +++---
 lib/README       | 2 +-
 m4/Makefile.am   | 2 +-
 m4/README        | 2 +-
 po/LINGUAS       | 2 +-
 po/Makevars      | 2 +-
 po/POTFILES.in   | 2 +-
 po/README        | 2 +-
 po/da.po         | 4 ++--
 po/de.po         | 4 ++--
 po/en_AU.po      | 6 +++---
 po/en_CA.po      | 6 +++---
 po/en_GB.po      | 6 +++---
 po/en_US.po      | 6 +++---
 po/eo.po         | 4 ++--
 po/fi.po         | 4 ++--
 po/fr.po         | 4 ++--
 po/hr.po         | 4 ++--
 po/hu.po         | 4 ++--
 po/nb.po         | 4 ++--
 po/ru.po         | 6 +++---
 po/sr.po         | 4 ++--
 po/sv.po         | 4 ++--
 src/Makefile.am  | 2 +-
 src/README       | 2 +-
 src/exch.c       | 2 +-
 src/exch.h       | 2 +-
 src/fileio.c     | 2 +-
 src/fileio.h     | 2 +-
 src/game.c       | 2 +-
 src/game.h       | 2 +-
 src/globals.c    | 2 +-
 src/globals.h    | 2 +-
 src/help.c       | 2 +-
 src/help.h       | 2 +-
 src/intf.c       | 2 +-
 src/intf.h       | 2 +-
 src/move.c       | 2 +-
 src/move.h       | 2 +-
 src/system.h     | 2 +-
 src/trader.c     | 4 ++--
 src/trader.h     | 2 +-
 src/utils.c      | 2 +-
 src/utils.h      | 2 +-
 55 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/COPYING b/COPYING
index cdfb804..5e5d6d0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/INSTALL b/INSTALL
index f13a9e9..62d78c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/Makefile.am b/Makefile.am
index d0f5c17..6c57647 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/NEWS b/NEWS
index 3c5b05b..05b7a63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/README b/README
index 50d9d91..0e4ff88 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
@@ -67,7 +67,7 @@ welcomed!  Please send these to:
 Copyright
 =========
 
-Copyright (C) 1990-2016, John Zaitseff.
+Copyright (C) 1990-2017, John Zaitseff.
 
 Star Traders is  free software that is distributed under  the terms of the
 GNU  General Public  License.  You  can redistribute  it and/or  modify it
diff --git a/build-aux/README b/build-aux/README
index c053394..cce2f59 100644
--- a/build-aux/README
+++ b/build-aux/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/configure.ac b/configure.ac
index f16bfa1..4d02bba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl *********************************************************************
 dnl *                                                                   *
 dnl *           Star Traders: A Game of Interstellar Trading            *
-dnl *              Copyright (C) 1990-2016, John Zaitseff               *
+dnl *              Copyright (C) 1990-2017, John Zaitseff               *
 dnl *                                                                   *
 dnl *********************************************************************
 dnl
diff --git a/data/Makefile.am b/data/Makefile.am
index 848e664..22a9bad 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/data/README b/data/README
index 0f93686..39afa09 100644
--- a/data/README
+++ b/data/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 15a29ea..d327088 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/doc/README b/doc/README
index d302b43..9d72fc0 100644
--- a/doc/README
+++ b/doc/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/doc/trader.6 b/doc/trader.6
index 3ea7f69..6e41151 100644
--- a/doc/trader.6
+++ b/doc/trader.6
@@ -1,7 +1,7 @@
 .\" *********************************************************************
 .\" *                                                                   *
 .\" *           Star Traders: A Game of Interstellar Trading            *
-.\" *              Copyright (C) 1990-2016, John Zaitseff               *
+.\" *              Copyright (C) 1990-2017, John Zaitseff               *
 .\" *                                                                   *
 .\" *********************************************************************
 .\"
@@ -41,7 +41,7 @@
 .if \n[.g] .mso www.tmac
 .\"
 .\" *********************************************************************
-.TH TRADER 6 "5th January, 2016" "Unix-like systems"
+.TH TRADER 6 "14th May, 2017" "Unix-like systems"
 .SH NAME
 trader \- a game of interstellar trading
 .\" *********************************************************************
@@ -200,7 +200,7 @@ Australia
 .PP
 .\" *********************************************************************
 .SH COPYRIGHT
-Copyright \(co 1990\-2016, John Zaitseff.
+Copyright \(co 1990\-2017, John Zaitseff.
 .PP
 \fBStar Traders\fR is free software that is distributed under the terms
 of the GNU General Public License.  You can redistribute it and/or modify
diff --git a/lib/README b/lib/README
index 368fec9..4f45ce5 100644
--- a/lib/README
+++ b/lib/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 34dd287..0a91dfe 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/m4/README b/m4/README
index 0a2eb10..f48e03b 100644
--- a/m4/README
+++ b/m4/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/po/LINGUAS b/po/LINGUAS
index ed2856f..59a1abb 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/po/Makevars b/po/Makevars
index 96aa50e..ab2e5f2 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bf69c09..7e0e677 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/po/README b/po/README
index deedc2c..e56aad5 100644
--- a/po/README
+++ b/po/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/po/da.po b/po/da.po
index 7ef8d30..e412e6b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Danish Translations for Star Traders                  *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:44+1000\n"
+"PO-Revision-Date: 2017-05-14 06:24+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff --git a/po/de.po b/po/de.po
index 1515671..ad065a8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 German Translations for Star Traders                  *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:44+1000\n"
+"PO-Revision-Date: 2017-05-14 06:23+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index 4e0bb94..a891b4e 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -1,21 +1,21 @@
 # *************************************************************************
 # *                                                                       *
 # *          English (Australian) Translations for Star Traders           *
-# *                Copyright (C) 1990-2016, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same licence as Star Traders.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:45+1000\n"
+"PO-Revision-Date: 2017-05-14 06:23+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index caa166a..75b2344 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,21 +1,21 @@
 # *************************************************************************
 # *                                                                       *
 # *           English (Canadian) Translations for Star Traders            *
-# *                Copyright (C) 1990-2016, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same licence as Star Traders.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:45+1000\n"
+"PO-Revision-Date: 2017-05-14 06:22+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 703064d..56a89a8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,21 +1,21 @@
 # *************************************************************************
 # *                                                                       *
 # *            English (British) Translations for Star Traders            *
-# *                Copyright (C) 1990-2016, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same licence as Star Traders.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:46+1000\n"
+"PO-Revision-Date: 2017-05-14 06:24+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index 4bbee45..8371f4d 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -1,21 +1,21 @@
 # *************************************************************************
 # *                                                                       *
 # *              English (US) Translations for Star Traders               *
-# *                Copyright (C) 1990-2016, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same licence as Star Traders.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:46+1000\n"
+"PO-Revision-Date: 2017-05-14 06:21+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
diff --git a/po/eo.po b/po/eo.po
index 3998480..7eb0301 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                Esperanto Translations for Star Traders                *
-# *                 Copyright (C) 2013-16, John Zaitseff                  *
+# *                 Copyright (C) 2013-17, John Zaitseff                  *
 # *         Copyright (C) 2013-16, Free Software Foundation, Inc.         *
 # *                                                                       *
 # *************************************************************************
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:47+1000\n"
+"PO-Revision-Date: 2017-05-14 06:23+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
diff --git a/po/fi.po b/po/fi.po
index 2e0a481..9319c31 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Finnish Translations for Star Traders                 *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *          Copyright (C) 2012, Free Software Foundation, Inc.           *
 # *                                                                       *
 # *************************************************************************
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:48+1000\n"
+"PO-Revision-Date: 2017-05-14 06:22+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
diff --git a/po/fr.po b/po/fr.po
index e601240..d7269e3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 French Translations for Star Traders                  *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *         Copyright (C) 2012-15, Free Software Foundation, Inc.         *
 # *                                                                       *
 # *************************************************************************
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:49+1000\n"
+"PO-Revision-Date: 2017-05-14 06:24+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
diff --git a/po/hr.po b/po/hr.po
index f37aaf0..49db5ee 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                Croatian Translations for Star Traders                 *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:49+1000\n"
+"PO-Revision-Date: 2017-05-14 06:26+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
diff --git a/po/hu.po b/po/hu.po
index a4a7940..e153fa1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                Hungarian Translations for Star Traders                *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:49+1000\n"
+"PO-Revision-Date: 2017-05-14 06:24+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
diff --git a/po/nb.po b/po/nb.po
index b47609d..3bfba23 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *            Norwegian Bokmål Translations for Star Traders             *
-# *                 Copyright (C) 2012-16, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:50+1000\n"
+"PO-Revision-Date: 2017-05-14 06:21+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
diff --git a/po/ru.po b/po/ru.po
index 31ba6a2..fa02f7d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,14 +2,14 @@
 # *                                                                       *
 # *                 Russian Translations for Star Traders                 *
 # *             Русский перевод для игры «Звёздные торговцы»              *
-# *                Copyright (C) 1990-2016, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
 #   Vladimir B. Tsarkov <lipetsk-gnu-lug@bk.ru>, 2012.
 #   Pavel Maryanov <acid@jack.kiev.ua>, 2012.
 #
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:52+1000\n"
+"PO-Revision-Date: 2017-05-14 06:26+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
diff --git a/po/sr.po b/po/sr.po
index 1268f6c..572df73 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Serbian Translation for Star Traders                  *
-# *                   Copyright (C) 2016, John Zaitseff                   *
+# *                 Copyright (C) 2016-17, John Zaitseff                  *
 # *          Copyright (C) 2016, Free Software Foundation, Inc.           *
 # *                                                                       *
 # *************************************************************************
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:52+1000\n"
+"PO-Revision-Date: 2017-05-14 06:20+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
diff --git a/po/sv.po b/po/sv.po
index 5be05fb..92207aa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Swedish Translations for Star Traders                 *
-# *                 Copyright (C) 2015-16, John Zaitseff                  *
+# *                 Copyright (C) 2015-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2016-04-16 12:52+1000\n"
+"PO-Revision-Date: 2017-05-14 06:22+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 796c0e2..9af0268 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
diff --git a/src/README b/src/README
index 7e7f727..091077c 100644
--- a/src/README
+++ b/src/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 
diff --git a/src/exch.c b/src/exch.c
index 7060d41..f05f7b7 100644
--- a/src/exch.c
+++ b/src/exch.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/exch.h b/src/exch.h
index b0f5f2e..8d76aa7 100644
--- a/src/exch.h
+++ b/src/exch.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/fileio.c b/src/fileio.c
index e0862aa..2dec4b6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/fileio.h b/src/fileio.h
index 15bf470..63819b5 100644
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/game.c b/src/game.c
index 001eb23..6e9d525 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/game.h b/src/game.h
index f9f5420..9075990 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/globals.c b/src/globals.c
index 5dc077c..b25389e 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/globals.h b/src/globals.h
index 89b2993..93e6a06 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/help.c b/src/help.c
index 3f5aa89..b35e120 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/help.h b/src/help.h
index 2dfb494..78352d9 100644
--- a/src/help.h
+++ b/src/help.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/intf.c b/src/intf.c
index b104843..9a09a37 100644
--- a/src/intf.c
+++ b/src/intf.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/intf.h b/src/intf.h
index 40a675f..c179110 100644
--- a/src/intf.h
+++ b/src/intf.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/move.c b/src/move.c
index a2d0365..0ac40ff 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/move.h b/src/move.h
index 9593494..8456a99 100644
--- a/src/move.h
+++ b/src/move.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/system.h b/src/system.h
index 8139fb7..1c47a00 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/trader.c b/src/trader.c
index d89b672..8f6fad9 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
@@ -293,7 +293,7 @@ This program is free software that is distributed under the terms of the\n\
 GNU General Public License, version 3 or later.  You are welcome to\n\
 modify and/or distribute it under certain conditions.  This program has\n\
 NO WARRANTY, to the extent permitted by law; see the License for details.\n\
-"), program_name, PACKAGE_VERSION, "1990-2016");
+"), program_name, PACKAGE_VERSION, "1990-2017");
 
     exit(EXIT_SUCCESS);
 }
diff --git a/src/trader.h b/src/trader.h
index 7ab957f..392a9ae 100644
--- a/src/trader.h
+++ b/src/trader.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/utils.c b/src/utils.c
index 6419098..5e39947 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 
diff --git a/src/utils.h b/src/utils.h
index 4364ebb..db596fd 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,7 +1,7 @@
 /************************************************************************
 *                                                                       *
 *             Star Traders: A Game of Interstellar Trading              *
-*                Copyright (C) 1990-2016, John Zaitseff                 *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                       *
 ************************************************************************/
 

From 3f804b831eef557877760450dbd8c1c4597b0d81 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sun, 14 May 2017 06:31:10 +1000
Subject: [PATCH 27/99] Update the copyright date to 2017

---
 po/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/README b/po/README
index 284d32f..f21270f 100644
--- a/po/README
+++ b/po/README
@@ -1,7 +1,7 @@
 **************************************************************************
 *                                                                        *
 *              Star Traders: A Game of Interstellar Trading              *
-*                 Copyright (C) 1990-2016, John Zaitseff                 *
+*                 Copyright (C) 1990-2017, John Zaitseff                 *
 *                                                                        *
 **************************************************************************
 

From e982b9121dcd375b8c47dce04702f664cf63a3f6 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sun, 14 May 2017 06:55:56 +1000
Subject: [PATCH 28/99] Automatically replace $Id$ with Git SHA1 checksum of a
 file

---
 .gitattributes | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..983d56a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+Makefile.am		ident
+/configure.ac		ident
+/build-aux/bootstrap	ident
+/doc/trader.*		ident
+/po/LINGUAS		ident
+/po/Makevars		ident
+/po/POTFILES.in		ident
+/src/*.c		ident
+/src/*.h		ident

From 793ef176c9e56c508b0caff21afb985f5ffe5013 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sun, 14 May 2017 07:17:35 +1000
Subject: [PATCH 29/99] Update files to the latest version from the GNU
 Autoconf archive

---
 m4/ax_append_flag.m4     | 6 +++---
 m4/ax_c___attribute__.m4 | 6 +++---
 m4/ax_cflags_warn_all.m4 | 6 +++---
 m4/ax_require_defined.m4 | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4
index 08f2e07..e8c5312 100644
--- a/m4/ax_append_flag.m4
+++ b/m4/ax_append_flag.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+#      https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -34,7 +34,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -49,7 +49,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 6
+#serial 7
 
 AC_DEFUN([AX_APPEND_FLAG],
 [dnl
diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4
index cf3d62b..6a1ede1 100644
--- a/m4/ax_c___attribute__.m4
+++ b/m4/ax_c___attribute__.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html
+#    https://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -28,7 +28,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -43,7 +43,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 8
+#serial 9
 
 AC_DEFUN([AX_C___ATTRIBUTE__], [
   AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__],
diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4
index 1f07799..094577e 100644
--- a/m4/ax_cflags_warn_all.m4
+++ b/m4/ax_cflags_warn_all.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
+#    https://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -43,7 +43,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -58,7 +58,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 15
+#serial 16
 
 AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl
 AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4
index cae1111..17c3eab 100644
--- a/m4/ax_require_defined.m4
+++ b/m4/ax_require_defined.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+#    https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -30,7 +30,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#serial 2
 
 AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
   m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])

From e6493b4184f353a2c0d0adf2a49cbe9365418102 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 09:12:52 +1000
Subject: [PATCH 30/99] Fix an off-by-one bug in the macros GALAXY_MAP_RIGHT
 and GALAXY_MAP_DOWN

This bug has been present since commit e2dbe549b2af7dfd909480fee4d97cf694b0d1fc
dated Sat Jul 16 13:34:13 2011 +1000: almost six years ago!
---
 src/move.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/move.c b/src/move.c
index 0ac40ff..bf9d649 100644
--- a/src/move.c
+++ b/src/move.c
@@ -37,10 +37,10 @@
 
 // Calculate positions near (x,y), taking the edge of the galaxy into account
 
-#define GALAXY_MAP_LEFT(x, y)	(((x) <= 0)     ? MAP_EMPTY : galaxy_map[(x) - 1][(y)])
-#define GALAXY_MAP_RIGHT(x, y)	(((x) >= MAX_X) ? MAP_EMPTY : galaxy_map[(x) + 1][(y)])
-#define GALAXY_MAP_UP(x, y)	(((y) <= 0)     ? MAP_EMPTY : galaxy_map[(x)][(y) - 1])
-#define GALAXY_MAP_DOWN(x, y)	(((y) >= MAX_Y) ? MAP_EMPTY : galaxy_map[(x)][(y) + 1])
+#define GALAXY_MAP_LEFT(x, y)	(((x) <= 0)           ? MAP_EMPTY : galaxy_map[(x) - 1][(y)])
+#define GALAXY_MAP_RIGHT(x, y)	(((x) >= (MAX_X - 1)) ? MAP_EMPTY : galaxy_map[(x) + 1][(y)])
+#define GALAXY_MAP_UP(x, y)	(((y) <= 0)           ? MAP_EMPTY : galaxy_map[(x)][(y) - 1])
+#define GALAXY_MAP_DOWN(x, y)	(((y) >= (MAX_Y - 1)) ? MAP_EMPTY : galaxy_map[(x)][(y) + 1])
 
 #define assign_vals(x, y, left, right, up, down)			\
     do {								\

From bb06d81534077c84748364763cd5e445276e5762 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 09:21:30 +1000
Subject: [PATCH 31/99] Update ax_with_curses.m4 to latest version from the GNU
 Autoconf archive

This version changes CURSES_LIB to the plural CURSES_LIBS, and adds the
CURSES_CFLAGS variable.  It also uses pkg-config(1) if that is available.
---
 m4/ax_with_curses.m4 | 144 +++++++++++++++++++++++++++++++------------
 src/Makefile.am      |   4 +-
 2 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/m4/ax_with_curses.m4 b/m4/ax_with_curses.m4
index e4cbd31..dcdc129 100644
--- a/m4/ax_with_curses.m4
+++ b/m4/ax_with_curses.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
+#      https://www.gnu.org/software/autoconf-archive/ax_with_curses.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -12,7 +12,9 @@
 #   present, along with the associated header file.  The NcursesW
 #   (wide-character) library is searched for first, followed by Ncurses,
 #   then the system-default plain Curses.  The first library found is the
-#   one returned.
+#   one returned. Finding libraries will first be attempted by using
+#   pkg-config, and should the pkg-config files not be available, will
+#   fallback to combinations of known flags itself.
 #
 #   The following options are understood: --with-ncursesw, --with-ncurses,
 #   --without-ncursesw, --without-ncurses.  The "--with" options force the
@@ -52,23 +54,29 @@
 #
 #   (These preprocessor symbols are discussed later in this document.)
 #
-#   The following output variable is defined by this macro; it is precious
-#   and may be overridden on the ./configure command line:
+#   The following output variables are defined by this macro; they are
+#   precious and may be overridden on the ./configure command line:
 #
-#     CURSES_LIB  - library to add to xxx_LDADD
+#     CURSES_LIBS  - library to add to xxx_LDADD
+#     CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
 #
-#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
-#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
-#   Makefile.am.  For example:
+#   In previous versions of this macro, the flags CURSES_LIB and
+#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
+#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
+#   eventually supersede the use of AX_WITH_CURSES. Neither the library
+#   listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
+#   respectively CPPFLAGS, by default. You need to add both to the
+#   appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
+#   example:
 #
-#     prog_LDADD = @CURSES_LIB@
+#     prog_LDADD = @CURSES_LIBS@
+#     prog_CPPFLAGS = @CURSES_CFLAGS@
 #
-#   If CURSES_LIB is set on the configure command line (such as by running
-#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
-#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
-#   override the standard #include search path.  If the user needs to
-#   specify an alternative path for a library (such as for a non-standard
-#   NcurseW), the user should use the LDFLAGS variable.
+#   If CURSES_LIBS is set on the configure command line (such as by running
+#   "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
+#   is <curses.h>. If the user needs to specify an alternative path for a
+#   library (such as for a non-standard NcurseW), the user should use the
+#   LDFLAGS variable.
 #
 #   The following shell variables may be defined by this macro:
 #
@@ -167,7 +175,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -182,11 +190,66 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 15
+#serial 18
+
+# internal function to factorize common code that is used by both ncurses
+# and ncursesw
+AC_DEFUN([_FIND_CURSES_FLAGS], [
+    AC_MSG_CHECKING([for $1 via pkg-config])
+
+    AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
+    _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
+    _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
+
+    AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
+        AC_MSG_RESULT([no])
+        # No suitable .pc file found, have to find flags via fallback
+        AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
+            AS_ECHO()
+            pkg_cv__ax_cv_$1_libs="-l$1"
+            pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+
+            AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
+            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
+                [
+                    AC_MSG_RESULT([yes])
+                    AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                    AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                        ax_cv_$1=yes
+                        ],[
+                        AC_MSG_RESULT([no])
+                        m4_if(
+                            [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
+                            [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
+                        )
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+
+                        AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                        AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                            ax_cv_$1=yes
+                            ],[
+                            ax_cv_$1=no
+                        ])
+                    ])
+                ],[
+                    ax_cv_$1=no
+            ])
+        ])
+        ],[
+        AC_MSG_RESULT([yes])
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+        ax_cv_$1=yes
+    ])
+])
 
 AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
 AC_DEFUN([AX_WITH_CURSES], [
-    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
     AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
         [force the use of Ncurses or NcursesW])],
         [], [with_ncurses=check])
@@ -195,20 +258,17 @@ AC_DEFUN([AX_WITH_CURSES], [
         [], [with_ncursesw=check])
 
     ax_saved_LIBS=$LIBS
+    ax_saved_CPPFLAGS=$CPPFLAGS
+
     AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
         [ax_with_plaincurses=no], [ax_with_plaincurses=check])
 
     ax_cv_curses_which=no
 
     # Test for NcursesW
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
+        _FIND_CURSES_FLAGS([ncursesw])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
-        LIBS="$ax_saved_LIBS -lncursesw"
-
-        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
-        ])
         AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
             AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
         ])
@@ -216,7 +276,8 @@ AC_DEFUN([AX_WITH_CURSES], [
         AS_IF([test "x$ax_cv_ncursesw" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncursesw
-            CURSES_LIB="-lncursesw"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -318,16 +379,13 @@ AC_DEFUN([AX_WITH_CURSES], [
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncursesw_libs
+    unset pkg_cv__ax_cv_ncursesw_cppflags
 
     # Test for Ncurses
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
+        _FIND_CURSES_FLAGS([ncurses])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
-        LIBS="$ax_saved_LIBS -lncurses"
-
-        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
-        ])
         AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
             AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
         ])
@@ -335,7 +393,8 @@ AC_DEFUN([AX_WITH_CURSES], [
         AS_IF([test "x$ax_cv_ncurses" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncurses
-            CURSES_LIB="-lncurses"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
             AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
             AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -390,12 +449,13 @@ AC_DEFUN([AX_WITH_CURSES], [
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncurses_libs
+    unset pkg_cv__ax_cv_ncurses_cppflags
 
-    # Test for plain Curses (or if CURSES_LIB was set by user)
-
+    # Test for plain Curses (or if CURSES_LIBS was set by user)
     AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
-        AS_IF([test "x$CURSES_LIB" != x], [
-            LIBS="$ax_saved_LIBS $CURSES_LIB"
+        AS_IF([test "x$CURSES_LIBS" != x], [
+            LIBS="$ax_saved_LIBS $CURSES_LIBS"
         ], [
             LIBS="$ax_saved_LIBS -lcurses"
         ])
@@ -408,8 +468,8 @@ AC_DEFUN([AX_WITH_CURSES], [
         AS_IF([test "x$ax_cv_plaincurses" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=plaincurses
-            AS_IF([test "x$CURSES_LIB" = x], [
-                CURSES_LIB="-lcurses"
+            AS_IF([test "x$CURSES_LIBS" = x], [
+                CURSES_LIBS="-lcurses"
             ])
             AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -515,4 +575,8 @@ AC_DEFUN([AX_WITH_CURSES], [
     AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
 
     LIBS=$ax_saved_LIBS
+    CPPFLAGS=$ax_saved_CPPFLAGS
+
+    unset ax_saved_LIBS
+    unset ax_saved_CPPFLAGS
 ])dnl
diff --git a/src/Makefile.am b/src/Makefile.am
index 9af0268..c5121ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ trader_SOURCES	= \
 			system.h
 
 trader_CPPFLAGS	= -I$(top_builddir)/lib -I$(top_srcdir)/lib	\
-		  -DLOCALEDIR=\"$(localedir)\"
-trader_LDADD	= @CURSES_LIB@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
+		  @CURSES_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+trader_LDADD	= @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
 
 EXTRA_DIST	= README

From a315d2bae95b7e19aff4a73ccae9af15de5fcf0f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 09:25:14 +1000
Subject: [PATCH 32/99] Update to the latest GNU Portability Library release

---
 lib/.gitignore     | 8 ++++++++
 m4/.gitignore      | 2 ++
 m4/gnulib-cache.m4 | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/.gitignore b/lib/.gitignore
index d0227fe..4ce8259 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,5 +1,6 @@
 Makefile.am
 
+/_Noreturn.h
 /btowc.c
 /c-ctype.c
 /c-ctype.h
@@ -9,6 +10,11 @@ Makefile.am
 /config.charset
 /crc.c
 /crc.h
+/getopt-cdefs.in.h
+/getopt-core.h
+/getopt-ext.h
+/getopt-pfx-core.h
+/getopt-pfx-ext.h
 /getopt.c
 /getopt.in.h
 /getopt1.c
@@ -30,6 +36,8 @@ Makefile.am
 /localcharset.c
 /localcharset.h
 /locale.in.h
+/localtime-buffer.c
+/localtime-buffer.h
 /mbrtowc.c
 /mbsinit.c
 /mbsrtowcs-impl.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 2c36b31..de872f6 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -2,6 +2,7 @@
 /absolute-header.m4
 /assert.m4
 /btowc.m4
+/builtin-expect.m4
 /codeset.m4
 /config-h.m4
 /configmake.m4
@@ -40,6 +41,7 @@
 /locale-ja.m4
 /locale-zh.m4
 /locale_h.m4
+/localtime-buffer.m4
 /lock.m4
 /longlong.m4
 /mbrtowc.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2f6308c..dbbdadf 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

From b284e9faee28a8ad0255ca85a6e4fbf5792d90b9 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 10:19:04 +1000
Subject: [PATCH 33/99] Update strings to those in the latest GNU Portability
 Library release

---
 po/da.po    | 63 ++++++++++++++++-------------------------------------
 po/de.po    | 63 ++++++++++++++++-------------------------------------
 po/en_AU.po | 63 ++++++++++++++++-------------------------------------
 po/en_CA.po | 63 ++++++++++++++++-------------------------------------
 po/en_GB.po | 63 ++++++++++++++++-------------------------------------
 po/en_US.po | 63 ++++++++++++++++-------------------------------------
 po/eo.po    | 63 ++++++++++++++++-------------------------------------
 po/fi.po    | 63 ++++++++++++++++-------------------------------------
 po/fr.po    | 63 ++++++++++++++++-------------------------------------
 po/hr.po    | 63 ++++++++++++++++-------------------------------------
 po/hu.po    | 63 ++++++++++++++++-------------------------------------
 po/nb.po    | 63 ++++++++++++++++-------------------------------------
 po/ru.po    | 63 ++++++++++++++++-------------------------------------
 po/sr.po    | 63 ++++++++++++++++-------------------------------------
 po/sv.po    | 63 ++++++++++++++++-------------------------------------
 15 files changed, 285 insertions(+), 660 deletions(-)

diff --git a/po/da.po b/po/da.po
index e412e6b..d0ef3ec 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:24+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:01+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -1686,62 +1686,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: »%lc«"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tilvalg »%s« er tvetydigt; muligheder:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: tilvalg »%s%s« er tvetydigt\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: tilvalg »%s« er tvetydigt\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: tilvalg »%s%s« er tvetydigt; muligheder:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »--%s« tillader ikke et argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tilvalg blev ikke genkendt »%s%s«\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »%c%s« tillader ikke et argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: tilvalg »%s%s« tillader ikke et argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tilvalg »--%s« kræver et argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: tilvalg »%s%s« kræver et argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tilvalg blev ikke genkendt »--%s«\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tilvalg blev ikke genkendt »%c%s«\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- »%c«\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalg kræver et argument -- »%c«\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tilvalg »W %s« er tvetydigt\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »-W %s« tillader ikke et argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tilvalg »-W %s« kræver et argument\n"
diff --git a/po/de.po b/po/de.po
index ad065a8..2abf09e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:23+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:06+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -1687,62 +1687,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: „%lc“"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option „%s“ ist mehrdeutig; möglich wären:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: Option „%s%s“ ist mehrdeutig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: Option „%s“ ist mehrdeutig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Option „%s%s“ ist mehrdeutig; möglich wären:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unbekannte Option „%s%s“\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: Option „--%s“ erfordert ein Argumente\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: Option „%s%s“ erfordert ein Argumente\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unbekannte Option „--%s“\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unbekannte Option „%c%s“\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- „%c“\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: die Option erfordert ein Argument -- „%c“\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option „-W %s“ erfordert ein Argument\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index a891b4e..8ebfdb4 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:23+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 09:57+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
@@ -1672,62 +1672,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognised option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognised option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognised option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 75b2344..5b5c771 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:22+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 09:59+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
@@ -1672,62 +1672,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognized option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognized option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognized option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 56a89a8..f608ae2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:24+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
@@ -1672,62 +1672,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognised option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognised option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognised option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/en_US.po b/po/en_US.po
index 8371f4d..dc497c4 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:21+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 09:55+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -1672,62 +1672,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognized option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognized option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognized option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/eo.po b/po/eo.po
index 7eb0301..ba0794b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:23+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:07+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -1678,62 +1678,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: '%lc'"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: la modifilo '%s%s' estas plursenca\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: la modifilo '%s' estas plursenca\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: la modifilo '%s%s' estas plursenca; eblecoj:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '--%s' ne permesas argumenton\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: nerekonata modifilo '%s%s'\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: la modifilo '%s%s' ne permesas argumenton\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la modifilo '--%s' postulas argumenton\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: la modifilo '%s%s' postulas argumenton\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nerekonata modifilo '--%s'\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nerekonata modifilo '%c%s'\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: malvalida modifilo -- '%c'\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la modifilo postulas argumenton -- '%c'\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la modifilo '-W %s' estas plursenca\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la modifilo '-W %s' postulas argumenton\n"
diff --git a/po/fi.po b/po/fi.po
index 9319c31..7635459 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:22+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:08+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -1682,62 +1682,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ”%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen; mahdollisuudet:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tunnistamaton valitsin ’%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’%s%s’ ei salli argumenttia\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: valitsin ’%s%s’ vaatii argumentin\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin -- ’%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
diff --git a/po/fr.po b/po/fr.po
index d7269e3..4d6eb36 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:24+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:09+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -1697,62 +1697,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: « %lc »"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option « %s » est ambiguë; les possibilités sont:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option « %s%s » est ambiguë\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option « %s » est ambiguë\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option « %s%s » est ambiguë; les possibilités sont:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option « --%s » n'accepte pas d'argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: option « %s%s » non reconnue\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option « %c%s » n'accepte pas d'argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option « %s%s » n'accepte pas d'argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option « --%s » exige un argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option « %s%s » exige un argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: option « --%s » non reconnue\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: option « %c%s » non reconnue\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: option invalide -- « %c »\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option exige un argument -- « %c »\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option « -W %s » est ambiguë\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option « -W %s » n'accepte pas d'argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option « -W %s » exige un argument\n"
diff --git a/po/hr.po b/po/hr.po
index 49db5ee..fa75585 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:26+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:10+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -1682,62 +1682,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: „%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcija „%s” je višeznačna; mogućnosti:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: opcija „%s%s” je višeznačna\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: opcija „%s” je višeznačna\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: opcija „%s%s” je višeznačna; mogućnosti:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcija „--%s” ne dozvoljava argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: neprepoznata opcija „%s%s”\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija „%c%s” ne dozvoljava argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: opcija „%s%s” ne dozvoljava argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcija „--%s” zahtijeva argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: opcija „%s%s” zahtijeva argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznata opcija „--%s”\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznata opcija „%c%s”\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neispravna opcija -- „%c”\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcija zahtijeva argument -- „%c”\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcija „-W %s” je višeznačna\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija „-W %s” ne dozvoljava argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcija „-W %s” zahtijeva argument\n"
diff --git a/po/hu.po b/po/hu.po
index e153fa1..5e44a22 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:24+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:11+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -1676,62 +1676,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: „%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű; lehetőségek:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ismeretlen „%s%s” kapcsoló\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem enged meg argumentumot\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: a(z) „%s%s” kapcsolóhoz egy argumentum szükséges\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ismeretlen „--%s” kapcsoló\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen kapcsoló -- „%c”\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"
diff --git a/po/nb.po b/po/nb.po
index 3bfba23..60868da 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:21+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:12+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -1677,62 +1677,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: «%lc»"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valget «%s» er flertydig; muligheter:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: valget «%s%s» er flertydig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valget «%s%s» er flertydig; muligheter:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke et argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukjent valg «%s%s»\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: valget «%s%s» tillater ikke argumenter\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valget «--%s» krever et argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: valget «%s%s» krever et argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig valg -- «%c»\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valget krever et argument -- «%c»\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er flertydig\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valget «-W %s» krever et argument\n"
diff --git a/po/ru.po b/po/ru.po
index fa02f7d..e14746c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:26+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:13+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -1688,62 +1688,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: «%lc»"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: неоднозначный ключ «%s»; возможности:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: неоднозначный ключ «%s%s»\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: неоднозначный ключ «%s»\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: неоднозначный ключ «%s%s»; возможности:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: ключ «--%s» должен использоваться без аргумента\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: неизвестный ключ «%s%s»\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: ключ «%c%s» должен использоваться без аргумента\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: ключ «%s%s» должен использоваться без аргумента\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: ключ «--%s» должен использоваться с аргументом\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: ключ «%s%s» должен использоваться с аргументом\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: неизвестный ключ «--%s»\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: неизвестный ключ «%c%s»\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неверный ключ «%c»\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ключ «%c» должен использоваться с аргументом\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: неоднозначный ключ «-W %s»\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: ключ «-W %s» должен использоваться без аргумента\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: ключ «-W %s» должен использоваться с аргументом\n"
diff --git a/po/sr.po b/po/sr.po
index 572df73..9873941 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:20+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:13+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -1679,62 +1679,37 @@ msgstr "xwcrtomb: НИШТА"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: „%lc“"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ је нејасна; могућности:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: опција „%s%s“ је нејасна\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: опција „%s“ је нејасна\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: опција „%s%s“ је нејасна; могућности:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: непозната опција „%s%s“\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: опција „%s%s“ не дозвољава аргумент\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: опција „--%s“ захтева аргумент\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: опција „%s%s“ захтева аргумент\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непозната опција „--%s“\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непозната опција „%c%s“\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција -- „%c“\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент -- „%c“\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „-W %s“ захтева аргумент\n"
diff --git a/po/sv.po b/po/sv.po
index 92207aa..b8e7821 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-04-16 12:31+1000\n"
-"PO-Revision-Date: 2017-05-14 06:22+1000\n"
+"POT-Creation-Date: 2017-05-17 09:45+1000\n"
+"PO-Revision-Date: 2017-05-17 10:14+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1682,62 +1682,37 @@ msgstr "xwcrtomb: NUL"
 msgid "xwcrtomb: `%lc'"
 msgstr "xwcrtomb: ”%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: flaggan ”%s%s” är tvetydig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: flaggan ”%s” är tvetydig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”--%s” tar inget argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: okänd flagga ”%s%s”\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”%c%s” tar inget argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”%s%s” tar inget argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaggan ”--%s” kräver ett argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: flaggan ”%s%s” kräver ett argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga ”--%s”\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga ”%c%s”\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- ”%c”\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan ”-W %s” är tvetydig\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”-W %s” tar inget argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan ”-W %s” kräver ett argument\n"

From 0786bc2d6ac379ea182014c0ca8d717be79719e2 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 10:37:12 +1000
Subject: [PATCH 34/99] Upgrade GNU Gettext to version 0.19.8

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4d02bba..ec9d4cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.5])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 gl_INIT
 

From a2c5300d629098184a2559cca77c3c7f3113768f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 11:58:42 +1000
Subject: [PATCH 35/99] Update to Automake 1.15

---
 Makefile.am  | 3 ---
 configure.ac | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6c57647..57abc7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,9 +27,6 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-# Find various M4 macro snippets
-ACLOCAL_AMFLAGS = -I m4
-
 # Subdirectories to recurse into
 SUBDIRS = lib src data doc po m4
 
diff --git a/configure.ac b/configure.ac
index ec9d4cc..9c82018 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,10 +30,11 @@ AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader], [http://www.z
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
 AC_PREREQ([2.69])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/trader.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.15 -Wall -Werror foreign dist-xz])
 AC_CONFIG_LIBOBJ_DIR([lib])
 
 AC_PROG_CC

From 2d2793fe54a35882f1e9cc86a0999f81ec8c9ec9 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 12:17:20 +1000
Subject: [PATCH 36/99] Update files in the po directory to GNU Gettext 0.19.8

---
 po/Makefile.in.in | 14 ++++++++++++--
 po/Makevars       | 15 +++++++++++++++
 po/Rules-quot     |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c36f1ad..38c293d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -6,7 +6,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.19.5
+# Origin: gettext-0.19.8
 GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
@@ -43,6 +43,11 @@ install_sh = $(SHELL) @install_sh@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 
+# When building gettext-tools, we prefer to use the built programs
+# rather than installed programs.  However, we can't do that when we
+# are cross compiling.
+CROSS_COMPILING = @CROSS_COMPILING@
+
 GMSGFMT_ = @GMSGFMT@
 GMSGFMT_no = @GMSGFMT@
 GMSGFMT_yes = @GMSGFMT_015@
@@ -195,6 +200,11 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	    ;; \
 	esac
 	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot-header; then \
+	    sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
+	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
+	    rm -f $(DOMAIN).1po; \
+	  fi; \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
 	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
@@ -425,7 +435,7 @@ update-po: Makefile
 
 .nop.po-update:
 	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
diff --git a/po/Makevars b/po/Makevars
index ab2e5f2..dd3d154 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -63,5 +63,20 @@ USE_MSGCTXT = yes
 # These options get passed to msgmerge.
 MSGMERGE_OPTIONS = --width=132
 
+# These options get passed to msginit.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
+
 # Additional files to distribute.
 DISTFILES += README
diff --git a/po/Rules-quot b/po/Rules-quot
index 9dc9630..baf6528 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -15,7 +15,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \

From 77e8c68868e62c93089c62efa8e99bbc2f7df00c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 19:11:42 +1000
Subject: [PATCH 37/99] Generate po files before data files

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 57abc7d..e8d81f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@
 
 
 # Subdirectories to recurse into
-SUBDIRS = lib src data doc po m4
+SUBDIRS = lib src po data doc m4
 
 # Additional files to distribute
 EXTRA_DIST = build-aux/bootstrap

From a6b88fe12f5e98e0ca7a054f9db00ff27e12fd1a Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 20:12:44 +1000
Subject: [PATCH 38/99] Generate trader.desktop and install it in the correct
 location

---
 configure.ac     |  2 ++
 data/Makefile.am | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9c82018..46bd9c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,8 @@ AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [
 ])
 ])
 
+AC_SUBST([desktopdir],['${datadir}/applications'])
+
 AC_CONFIG_FILES([
 	Makefile
 	lib/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 22a9bad..76630b0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,4 +26,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-EXTRA_DIST     = README
+
+dist_desktop_DATA = trader.desktop
+
+EXTRA_DIST = \
+	README			\
+	trader.desktop.in
+
+
+trader.desktop: trader.desktop.in
+	msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@

From a1c15b0973f16cd5b780903a857cfee8028d5231 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 17 May 2017 20:49:03 +1000
Subject: [PATCH 39/99] Use a helper msgfmt-desktop script instead of invoking
 msgfmt(1) directly

---
 .gitattributes           | 19 ++++++++++---------
 Makefile.am              |  4 +++-
 build-aux/msgfmt-desktop | 23 +++++++++++++++++++++++
 data/Makefile.am         |  2 +-
 4 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100755 build-aux/msgfmt-desktop

diff --git a/.gitattributes b/.gitattributes
index 983d56a..3762a7e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,10 @@
-Makefile.am		ident
-/configure.ac		ident
-/build-aux/bootstrap	ident
-/doc/trader.*		ident
-/po/LINGUAS		ident
-/po/Makevars		ident
-/po/POTFILES.in		ident
-/src/*.c		ident
-/src/*.h		ident
+Makefile.am			ident
+/configure.ac			ident
+/build-aux/bootstrap		ident
+/build-aux/msgfmt-desktop	ident
+/doc/trader.*			ident
+/po/LINGUAS			ident
+/po/Makevars			ident
+/po/POTFILES.in			ident
+/src/*.c			ident
+/src/*.h			ident
diff --git a/Makefile.am b/Makefile.am
index e8d81f0..b00291c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,4 +31,6 @@
 SUBDIRS = lib src po data doc m4
 
 # Additional files to distribute
-EXTRA_DIST = build-aux/bootstrap
+EXTRA_DIST = \
+	build-aux/bootstrap		\
+	build-aux/msgfmt-desktop
diff --git a/build-aux/msgfmt-desktop b/build-aux/msgfmt-desktop
new file mode 100755
index 0000000..215b3c6
--- /dev/null
+++ b/build-aux/msgfmt-desktop
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Create or update desktop files using msgfmt(1)
+# $Id$
+
+# Usage:
+#   msgfmt-desktop -d PODIR INPUT OUTPUT
+
+set -e
+
+if [ x"$1" != x"-d" ]; then
+    echo "$0: Missing parameters" 1>&2
+    exit 1
+fi
+
+PODIR="$2"
+INPUT="$3"
+OUTPUT="$4"
+
+if ! msgfmt --desktop -d "$PODIR" --template "$INPUT" -o "$OUTPUT"; then
+    echo "$0: Using cp(1) program instead"
+    cp "$INPUT" "$OUTPUT"
+fi
diff --git a/data/Makefile.am b/data/Makefile.am
index 76630b0..390be57 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,4 +35,4 @@ EXTRA_DIST = \
 
 
 trader.desktop: trader.desktop.in
-	msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
+	$(top_srcdir)/build-aux/msgfmt-desktop -d $(top_srcdir)/po $< $@

From 0ad9e58661c5f29366dc846e5865a5c9af2b867a Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Thu, 18 May 2017 10:02:51 +1000
Subject: [PATCH 40/99] Update utility program version numbers in INSTALL

---
 INSTALL | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 62d78c2..27c784c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ and installation:
     multibyte character sequences (such as UTF-8) require a wide-character
     version of Curses, such as NcursesW, to work correctly.
 
-4.  The GNU Gettext library, version 0.19.5 or later, to allow the game to
+4.  The GNU Gettext library, version 0.19.8 or later, to allow the game to
     use languages other than English;  this is also called Native Language
     Support.  If you do not have  this library (and do not wish to install
     it), you may pass "--disable-nls" to the configure script.
@@ -93,7 +93,7 @@ can specify the compiler flags to use by passing the CFLAGS variable:
 
     ./configure CFLAGS="-g -O2 -Wall"
 
-The "configure" script  has many other options.  You may  obtain a list of
+The  configure script  has many other options.   You may obtain  a list of
 these by running:
 
     ./configure --help
@@ -168,8 +168,8 @@ installation.  If you are cloning the source code from the Git repository,
 however,  you will need to update these files yourself.  You will need the
 following additional tools installed on your system to do so:
 
-1.  Autoconf (http://www.gnu.org/software/autoconf/)
-2.  Automake (http://www.gnu.org/software/automake/)
+1.  Autoconf v2.69 or later (http://www.gnu.org/software/autoconf/)
+2.  Automake v1.15 or later (http://www.gnu.org/software/automake/)
 3.  GNU Portability Library (http://www.gnu.org/software/gnulib/)
 
 The  GNU Portability Library  may  be installed  by retrieving  the latest

From 1ca41849748604558b14574adf656d7d02499f30 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Thu, 18 May 2017 10:08:09 +1000
Subject: [PATCH 41/99] Mention the new msgfmt-desktop script in
 build-aux/README

---
 build-aux/README | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-aux/README b/build-aux/README
index cce2f59..98e5286 100644
--- a/build-aux/README
+++ b/build-aux/README
@@ -6,6 +6,7 @@
 **************************************************************************
 
 This directory, build-aux, contains auxiliary build-related files for Star
-Traders.  Apart  from "bootstrap" (and  this README file, of  course), all
-files are generated by either Autoconf, Automake or Gnulib.  The bootstrap
-script generates these files by running those tools in the correct order.
+Traders.  Apart from  "bootstrap"  and  "msgfmt-desktop" (and this  README
+file, of course), all files are generated by either  Autoconf, Automake or
+Gnulib.  The bootstrap script generates these files by running those tools
+in the correct order.

From 4d2b07c6f5d65ab3ff2aa01a928c4fb3f9398517 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Thu, 18 May 2017 17:19:44 +1000
Subject: [PATCH 42/99] Reword build-aux/README to explicitly list
 non-generated files

---
 build-aux/README | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-aux/README b/build-aux/README
index 98e5286..99f3cee 100644
--- a/build-aux/README
+++ b/build-aux/README
@@ -6,7 +6,12 @@
 **************************************************************************
 
 This directory, build-aux, contains auxiliary build-related files for Star
-Traders.  Apart from  "bootstrap"  and  "msgfmt-desktop" (and this  README
-file, of course), all files are generated by either  Autoconf, Automake or
-Gnulib.  The bootstrap script generates these files by running those tools
-in the correct order.
+Traders.  The following scripts are specific to this package:
+
+    bootstrap        - Generate auxiliary files needed for building
+    msgfmt-desktop   - Use msgfmt(1) or cp(1) to copy desktop files
+
+All other files in this directory (other than this README file, of course)
+are generated by Autoconf, Automake or Gnulib.  The bootstrap shell script
+generates these files by running those tools in the correct order; see the
+top-level INSTALL file for more details.

From ea892c08a814c669a54dead720b122fe09d456dd Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 19 May 2017 21:58:26 +1000
Subject: [PATCH 43/99] Add an icon image for Star Traders

A preliminary version of this icon was designed in Inkscape, then
extensively cleaned up by hand using the Emacs text editor.  SVG is not a
difficult standard to read and follow!
---
 data/trader.svg | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 data/trader.svg

diff --git a/data/trader.svg b/data/trader.svg
new file mode 100644
index 0000000..628160f
--- /dev/null
+++ b/data/trader.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Star Traders icon -->
+<!-- Copyright (C) 2016, John Zaitseff -->
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.1"
+    width="512"
+    height="512"
+    viewBox="0 0 512 512"
+    id="trader-icon">
+  <title>Star Traders icon</title>
+
+  <defs>
+    <linearGradient id="f-space" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#00005F" />
+      <stop offset="1" stop-color="#00002F" />
+    </linearGradient>
+    <radialGradient id="f-galaxy" cx="0.5" cy="0.5" r="0.5">
+      <stop offset="0"   stop-color="#FFFFFF" />
+      <stop offset="0.7" stop-color="#FFFF80" />
+      <stop offset="1"   stop-color="#FFFF00" />
+    </radialGradient>
+  </defs>
+
+  <g id="space">
+    <circle cx="256" cy="256" r="254" fill="url(#f-space)" stroke="#00002F" stroke-width="4" />
+  </g>
+
+  <g id="galaxy">
+    <path fill="url(#f-galaxy)" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"
+	  d="m 395.4,132.1 c -1.4,0 -2.9,0 -4.3,0.1 -48.4,1.2 -115.8,18.5 -169.5,40.7 -53.4,22.1 -112.7,57.3 -147.8,90.4 25.9,-16 56.3,-32 90,-47.1 8.2,-3.7 16.5,-7.3 25.1,-10.8 74.6,-30.9 149.9,-49.7 194.9,-49.4 23.6,0.1 38.8,5.5 41.4,17.1 2.8,12.8 -12.7,32.6 -41.7,54 -28.9,21.5 -73.3,45.4 -123.9,63.1 -43.9,15.4 -79.5,20.2 -93.3,14.2 -6.9,-3 -7.2,-9.9 4.5,-20.1 5.3,-4.7 12.7,-9.7 21.7,-14.9 -0.3,-1.2 -0.5,-2.5 -0.7,-3.7 -7.9,4.6 -15.1,9.4 -21.6,14.2 -19.7,14.6 -30.9,29 -29,37.6 5.3,24.4 91.3,10.1 175.8,-24.9 96.4,-39.9 164.5,-92.7 162.8,-121 -0.2,-2.6 -1.1,-5.1 -2,-7.4 -8.4,-21.1 -38.1,-32.4 -82.3,-32 z m -55.3,50.3 c -17.5,0 -41.1,3.9 -67.6,10.8 3.8,1 7.4,2.3 11,3.9 6.1,2.9 11.8,6.7 16.7,11.3 21,-4.1 37.2,-4.5 45.4,-0.8 6.9,3 7.2,9.9 -4.5,20.1 -5.3,4.7 -12.7,9.7 -21.6,14.9 0.3,1.2 0.5,2.5 0.7,3.7 7.9,-4.6 15.1,-9.4 21.6,-14.2 19.7,-14.6 30.9,-29 29,-37.6 -1.8,-8.4 -13.2,-12.2 -30.8,-12.2 z m -82.9,29.5 c -13.4,-0.4 -26.3,5.4 -35,15.7 -11.6,13.8 -13.6,33.3 -5,49.2 4.9,6.2 32,-0.9 47.3,-5 12.6,-3.4 26.5,-11 35.6,-15.9 0,-18.5 -11.6,-35.1 -29,-41.4 -4.5,-1.6 -9.1,-2.5 -13.9,-2.6 z m -51.8,3.3 c -3.5,1.4 -6.9,2.7 -10.4,4.2 -96.2,39.8 -164.1,92.5 -162.8,120.8 0.1,2.8 1.1,5.2 2,7.6 18.6,46.1 133.7,42 256.2,-8.7 59.5,-24.7 112.8,-57.3 147.8,-90.5 -26,16 -56.3,32.1 -90,47.2 -8.2,3.7 -16.5,7.3 -25.1,10.8 -113.7,47 -228.8,66.1 -236.2,32.3 -2.8,-12.8 12.7,-32.6 41.7,-54 16.5,-12.3 38.1,-25.3 63.1,-37.6 1.6,-11.7 6.4,-22.8 13.8,-32 z" />
+  </g>
+</svg>

From f4632c6a4290a2131761564156b13e408f47c372 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 19 May 2017 22:33:57 +1000
Subject: [PATCH 44/99] Add the standard copyright header to trader.svg

---
 .gitattributes  |  1 +
 data/trader.svg | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 3762a7e..b0d2eb8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@ Makefile.am			ident
 /configure.ac			ident
 /build-aux/bootstrap		ident
 /build-aux/msgfmt-desktop	ident
+/data/trader.svg		ident
 /doc/trader.*			ident
 /po/LINGUAS			ident
 /po/Makevars			ident
diff --git a/data/trader.svg b/data/trader.svg
index 628160f..88f4a83 100644
--- a/data/trader.svg
+++ b/data/trader.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Star Traders icon -->
-<!-- Copyright (C) 2016, John Zaitseff -->
 <svg
     xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -9,6 +7,33 @@
     height="512"
     viewBox="0 0 512 512"
     id="trader-icon">
+<!--
+*************************************************************************
+*                                                                       *
+*             Star Traders: A Game of Interstellar Trading              *
+*                Copyright (C) 1990-2017, John Zaitseff                 *
+*                                                                       *
+*************************************************************************
+
+Author: John Zaitseff <J.Zaitseff@zap.org.au>
+$Id$
+
+This file, trader.svg, contains the icon image for Star Traders.
+
+
+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 3 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, see http://www.gnu.org/licenses/.
+-->
   <title>Star Traders icon</title>
 
   <defs>

From 7e27ca018d1893114b67e9b390386102f3932873 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 19 May 2017 23:00:08 +1000
Subject: [PATCH 45/99] Add a glow behind the icon image

---
 data/trader.svg | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/trader.svg b/data/trader.svg
index 88f4a83..5ef8568 100644
--- a/data/trader.svg
+++ b/data/trader.svg
@@ -46,10 +46,14 @@ with this program.  If not, see http://www.gnu.org/licenses/.
       <stop offset="0.7" stop-color="#FFFF80" />
       <stop offset="1"   stop-color="#FFFF00" />
     </radialGradient>
+    <filter id="f-glow" x="-0.1" y="-0.1" width="1.2" height="1.2" style="color-interpolation-filters:sRGB">
+      <feGaussianBlur stdDeviation="6" />
+    </filter>
   </defs>
 
   <g id="space">
-    <circle cx="256" cy="256" r="254" fill="url(#f-space)" stroke="#00002F" stroke-width="4" />
+    <circle cx="256" cy="256" r="250" opacity="0.4" fill="#FFFFFF" stroke="none" filter="url(#f-glow)" />
+    <circle cx="256" cy="256" r="250" fill="url(#f-space)" stroke="none" />
   </g>
 
   <g id="galaxy">

From 112d7442189f1b90067e822b2e6dc77af309345e Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 19 May 2017 23:37:39 +1000
Subject: [PATCH 46/99] Add rendered (bitmap) versions of the icon image

The file trader.svg was rendered at different resolutions using the GIMP
graphics program.
---
 data/icons-128/trader.png | Bin 0 -> 11762 bytes
 data/icons-16/trader.png  | Bin 0 -> 693 bytes
 data/icons-22/trader.png  | Bin 0 -> 1128 bytes
 data/icons-24/trader.png  | Bin 0 -> 1217 bytes
 data/icons-256/trader.png | Bin 0 -> 26232 bytes
 data/icons-32/trader.png  | Bin 0 -> 1851 bytes
 data/icons-48/trader.png  | Bin 0 -> 3109 bytes
 data/icons-512/trader.png | Bin 0 -> 58962 bytes
 data/icons-64/trader.png  | Bin 0 -> 4605 bytes
 data/icons-96/trader.png  | Bin 0 -> 7835 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/icons-128/trader.png
 create mode 100644 data/icons-16/trader.png
 create mode 100644 data/icons-22/trader.png
 create mode 100644 data/icons-24/trader.png
 create mode 100644 data/icons-256/trader.png
 create mode 100644 data/icons-32/trader.png
 create mode 100644 data/icons-48/trader.png
 create mode 100644 data/icons-512/trader.png
 create mode 100644 data/icons-64/trader.png
 create mode 100644 data/icons-96/trader.png

diff --git a/data/icons-128/trader.png b/data/icons-128/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f47cd883ba8807398e273de35df57ef565fbab
GIT binary patch
literal 11762
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
U9aUHm=>Px#07*qoM6N<$g8Ad@?*IS*

literal 0
HcmV?d00001

diff --git a/data/icons-16/trader.png b/data/icons-16/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..a12a6ecad25f00b5cae2289ffed4b269f0cae675
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007fNkl<ZILnPw
z-%HbR6un9ek$j&x^y%xihoCpL#GF_o+5B#%i-v`m5hY8v<&QRs(O`3>k|TA_35qWv
zA_+bDATvbG7~$`<{RQHBn{Rr$pRvU<6dw+ZeLv^ibMHNu0OT;PFbWu|_4W7-qcPAY
zNiUX^%GNyrNqW9yG<y5QH}QsXHO<MP^bhezQFXP~tx#Bh6E%V89;1O_V#o|56bf@f
zr|W$s-eyE7UAai3afFF1IFC$ZVAL`0LZf*S%7_R7m8g7KGLfEf8#>)f;Y3BEuZwJ#
zmD%9&3}9v^glIH^gM%Q})*iy)FePKLU*%*l1m2w`7Zlt_PfrMoi{CLh`5AtH1a`Y0
zrKJy$pI?Xl{iirQtUzPq>i|iT?Q4ddn`?&C`5uwTCv<dtgvH{8&GrFaZxG?|FuJ;2
zaJ##aOg=(us|k{1jgnIN_@^Kj7q{@kVN6Vfv9<Mu1qN_>`U58?-yq9QCJ%BOec0Ue
zz-n#df>kIil=n#NS=erFc3^uufZ5r8^!5g!*LPrUZVcn&qnMr^!p263o%y)PTa=X4
zvp}T~*d-B?wl*`4k1OGFwR0sW_wB>ThzHBdW0;@s$JEpy3;DUdXWV9WicEA9YPBUw
z4Gq4)(UF9moohTG8Cq=<JFsJD$i*ZF78c&{KwEgQcT%=9WTFa~Ox?cJ8aq2p$<@{C
zh{tQOvSQ{oYI$`AUZEJSj&bWha$a6lA{N^%PX$TDGdm<iwTzl`$wcL-scG*?1u1g}
zBA%BeYqgfq>?r>|CJ|4CLZ7(EcDnLE$CQ&Lq7w0xWw&3gZjLII^?c68Juz)r?(&PC
b&z|!iMkWRp#Rw*{00000NkvXXu0mjf@r**_

literal 0
HcmV?d00001

diff --git a/data/icons-22/trader.png b/data/icons-22/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..3267aff10dfec7d025c0f2901d432f87dbfcf862
GIT binary patch
literal 1128
zcmV-u1eg1XP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX000CpNkl<ZILn=t
zeMr-J9LK+lC?X{Y8tLe~QP9k`2;q!7y`7voADGTuPED7Q<)*GpOFT5mhqSxSyQ}$d
zc4@j>%?_+T6gSh9{^^G9kBEYbFztz`2!lxJfxYkZ{jqtA^ECUx8}`Td``YK>{rP+u
z^L+qBq~)X_QV1#h?Ag&Ym8zjdE-!OQr9~d8)ZmfJ%`TOyw#8-}O`|h1(t6(=epkc-
zzW``3Nn$W`X0BUT;9)EijA=<3q@AR6l7^H<O7)7xd1ECdZM*m#-`#)Vfza96*)KM4
zF6&@S=UoI!Qj=035+!?OvIFh>?niJxbb5L=EF{D*NKkw#l(A$|5-Aa(p}So^xKI}6
z`yuf~`dLuMRHOvRWc%8EWeMWo5QCv3Yboh-=$0+}kd;*qqp=)CMJ8yq1qcpK_8N^R
zdCk{zaQG)Q3aeIWk&{!8t}Z(!CNAT}3ny;e=z`mQ5)U6X5JruuDHZbb^>?^i7`GHb
zz5fT@zWpG<`f=~x1p4}hQBh$<aq+K6Nh!ysO}TU?9xGNP;`Z%Q;>pq7t%A)qn8xDc
z>s#i7Zrf(WxpTc38oCOTsRe7->L8Ki!sQyl)2Dyq$rC5;-~Wrw#zC()<K4SGc=jwF
zF)<pbREL|{)~#iOfzZ{fGhwy1<HCg=R960u+S(4N)kkps`Z#XhbR#39QfQQ3UyJ?w
zt58~6g_)TeOimtvQpp4S779hai-m<5Jbq|oWD(As=|)|h6<4nOiPx`(pwm_3)~yjr
z(?fC-+)0hghsAONPG>XTzyAex`wtYQQGhZQ1F3Y^IFm|^<NoxMk}7ci{7?Asp_xi>
z8s+7u2vR_>K0JCffZpCt;ZM7}PvO<8P7Dt>p{Ayef@z|lvIHn&(FE3xF+Teo8XLP8
z4<6*<&6^@2y~4sH$jz<6vSmq#i?g7rsvaXF?U<gn;o`-gsZ7Vv({miHt(8>1_&F$J
z-#{+U8(@5)D3!bM{P~x7`!<4Lg@R8fCXV6p<0fiU8`ZB3moEK?hK5EoHr8Ww^f)=>
zD59ctbLsn`jD3y7M2nR<99PvgTQb#;;qKk9uySRpFi{&fW<#Sn1he@ls;dv8zyC0m
zqnfN#jOgfWI-{Hy%GeIC-R?@|10vJw3-3%$Dg^k{R3xrliy{{&@$zL7St<<<M>b8^
z9<m&ty6+Z(LM%>n3j@N(&uso9W6hd$uSTOM3uVy&=*SJZ)VLhMr;L41id_^c67BGo
zl$@9wX<-S`>N_2{Q20bG1<F_yA|iCH#0vE<p}AemSKsGCC6bhZnVFdlfot=lMbB5C
zNEGK?O8Vj9nXUg>^z%JUCR3|cEKVOIsCS|6^F~=LzwPv=zu3DM<a;1xcKc9jLc$@d
uLb2CLV@i*y)}v79o!qAm$7S_GkLf?9Fuk0XH93?30000<MNUMnLSTZ^LM*xf

literal 0
HcmV?d00001

diff --git a/data/icons-24/trader.png b/data/icons-24/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3027f9d2a1757d161e7088d76edd180f1ad847e
GIT binary patch
literal 1217
zcmV;y1U~zTP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000DtNkl<ZNXMm?
zYfMvT7{}lEK`qQ2U4vf)#ni<FFw`i^V9e=gaZ@fWHvuh|sT~(7(gItMOF=fd$!bMl
zg{HFx<1JB&C@o>miN*234>QWP%&0-Ue(?TH{qK2Cia|jXJjp-jB<DT9=Xsyodl(yY
z0hmFWNfJoDq@d<zSE52u)gqS{o|MUQ-7;B@TQ1jkDHO)$)>dZ%U*lOTc)p#%Cb~TE
zS)_R+|Jc}iogifV%UB{9OCZIQ;z(+eiWEzVfgmLRqf%9G<KK9`oi)zL82HCF+wUP#
z>E=HfOTxS0j75{8NbBL_lRRLzyH;|>YevSx4F>yKiDc8rRN;)RBYgvjB<5yOku~x)
zBc8a;v)lVuN+g=$>B1TNnzWXTMBQ$0@A=ddu9?h}9RKNr<xMzakt8Lg(zpRnP6Tei
zHzuYoe=2YvpA=+dRHDAV5e`QS-0mh^zPuZQgWu!u;mt@%(Lkjt<B9j>27=zFTISE+
z2)%wEdVBlu;K5%Q8tTQdW51%Vt{x>NMi`By^sbz6O1yXxfWpG`Tb#{!olgc|wk!uN
zEk`jjGK^EF2C!pC8?v)a(CO;2YnKV-<uzEmcmu6fK&{RrW)$fYT9<&<))NVgH_=4!
z1q;#%ydM`Y_M@`Wils}pV(#2Tx^E$`Z8&$X8{OR<xPSjBwAvCfl0+dg5_}z;&NO&?
zM?#@6>|?>fhLdl?v$Lzw({r4*xd*kiZ4?3vN=tvilPCY->C+)pRW*wV4GH-U4GnDw
z3)_NAmm2Z%<u)8Tq=T22lHRX^T>fnrqt+i7g?o7=!ff6TgJCz__u$?=2d-Z2L1^f9
zJbN}s-f_9<`422ym`XWmq;(BsbT6)5t3_5;9s&bXML1($KqlL8o*QtFdL9svh1}dS
z+_=$%M~~W3Q`3lo0y7pZN+YNXj~_eH*LRTOZlZS$WZZ_kcUxdG8Of<KGG@Z;*%2a~
zv2ZL|LI#3^3%WSm+dBbAj^xueHMHFy$?GiIzJ<b&E!KH>xQ>ih<G=wk9zL`ayq&^V
zMc@jGxtYS6`^s|;XY6w<U!K{?_*9%TCy`1lnzrvpiOPV#e<~%;Kq2}Gr%yMazyD_n
zLpz1R0=vDIc2GwZR6zw`qDm=(uW!saIAdW@Ds@fFYVD0LE!{|PCQ7Z=iXH0bmqewO
zL-nmketsc&zmt+(jI(DeaOX}XRoHd}1@ZF!azZ#`p|Dtv$BT`o*K2P-fBunZ;LMo_
zl$E8RxHyH%QA3@YhU?eUDE=C_Tw5t8T53A(@#;z8f}j{8V4yfERH~hM$;s(dV(W3?
z!Wvw;5>D;E8l9a=%0nzNGdB^Gcl1}JHSdHo_8H>he#jXe72>et^L(Pg#XFR-h$+FP
z(#Z2;hn+aCJ34+_A(6xme<)lcS#`^1bA*f?*RKv7ept{vzxe_1;i4jQ<fNw>Klb=M
zpH5ghI-D!U!QXc1^LZ`^(SN^BwRjTx_CtS?-<Cj&#Szb^A|G5bS(2MeE>G{`O=Pt?
f;`y4%ep~(r6HQo(xdo}I00000NkvXXu0mjf+44ph

literal 0
HcmV?d00001

diff --git a/data/icons-256/trader.png b/data/icons-256/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f6f786fb8767f06cc4ee86a0f5c750b72e4d293
GIT binary patch
literal 26232
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

literal 0
HcmV?d00001

diff --git a/data/icons-32/trader.png b/data/icons-32/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..9367db5a2bc744fa73eedc15f9978130538354b9
GIT binary patch
literal 1851
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

literal 0
HcmV?d00001

diff --git a/data/icons-48/trader.png b/data/icons-48/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..553cd9cda9e90692162c1b972615fa4943b74be0
GIT binary patch
literal 3109
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

literal 0
HcmV?d00001

diff --git a/data/icons-512/trader.png b/data/icons-512/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..77ef1b05083f35c7981c033995020f9f6f86b2d4
GIT binary patch
literal 58962
zcmZsDc|4Tu_y5coW8boqrAU@Ub`>+W%94GF3X!a(B0Dp7St9$|$dWCTy~GS9WeHic
zWK<&S*vFXVd#j%3`MiFw-(U5|-1mL1v%Jqa?{h8>O^q+IFbXh&Kp+<VOS<MD5Cr%y
z1Vj%5{@D%~A%Z|Z`So?RECVK23TS<;x_M%X#lhMyKvG>ZQl^Eb@tmjF#ami+9)DZ2
z&i`gVJ@d4swUtZKIH3V?1Ebh{fR|YK^it;I<vQ1DWZSq(RMi%_{`T~=+fcj~6KGmJ
zQ1ZvaP3=I#_~^~YKN2?6xCFT`nqSkWq<(t}5%0=MN0@6{9@l?(g4Vzw!a!Oor$kiW
z;c2QN(axOF(m=n$w8G3?ymUU@*gPm&p-^E`YJX1>i9FloeCe%*=KjXBA5Xf+3DZ9o
z_@f3ir1pZK-#pXff@hB4Jo&M0?G!?8_uN-H_!@a*?yIWz8aaK|Vg7(Juc$T4Zr1=v
z_yp^(3JTF!?8PoTm7{^T!|*N>TiAsg=+wxzBip~YQWiR%Fl6Ld@EF^!a#33e7#&J*
zU@<l?(pUPu=m}Tm01NhaZJPR*`5?$Oa-1`kd66IDuK)#JUBvBE=-n#?Z~vBF3k#w6
zQX3(J3g}6quXKt{=XIE`ilv{ix~aO5`2OAoGM2O_odoe_PyZ=eAnKH2aD%>mEbfRT
zixy-pl)i8gBnt@3vAxQ&>RGUv1aa_von_ML@xmtJN$hzxfBwE#rmxgPBYTRA-kdc*
z@Y!6Sr=H$lUpRbWfKQ<k%)ml4o~vAsVVgO;dI+pQ^IN*er`|u(<rbdLr!>+7g53zw
zm~iFH$N9Kp3&7_@%Dm0?X{8;_i)N2e!zk;0RX2{@XE;v(#Y>(xC<YM*KT`a|H=IPN
z7-i)<Lt}pv2Ao$<hNv^UA~nl{OK_BfXdvx)I|{U3i<YgMMsrD@8r+jULVmuv_YuiP
z_2)G`!w_Pr)z24a6mF~IXyS`Vmljn-B=E@Eou&`HdY@>wPXZ-bwA)>AU?SXd96<lv
zw|K+-L)A;oK8%1LeQ>oQ`)iZO=$TN13<0$w#}0do`#)FC!=2x=R#`mrYLk^L-=|=)
z&rTi@ce|@;|0c-Bsk?^UigsANXm5W5xpCjWcK1tvwE*6UYP|2WGEg_$5oQws-5H>R
zshs8D8u3N;q{}wB^iABc`jij<By;6Oce;5gEV10~fu+dq#Dw$on|(`l79Uagz<EYz
z#}O_!en_=%cyT|dl;O7`7<C+2xf6`{i(a&w;d%q_a;)rghEl3*M0ohmI9*P<kR;J4
zXK@Rka_!aYPX=kvc4EZ!bA@;JYLOb&&nE|_XWmjC_*AjJx9n%A^sq~PN*M1h`)Prs
zz8+5#cMrJ|WW4M%zjVIJC?{NJ!beCW=rYUhH1~Va+DB6I9`w4uAk~W~#Xisj&cPzR
z1Z$}FtPKq@B=3nrLoM%^DkNn77lmns?P!bn8=nQ*q@FC1v6KF5cZLDQHA;n%VqDwW
zJT+BWcgtyzp;r6Hz1Nopj)<2dRa|;_1br4L_k#8}b%?&d6fkphZ?h7ljKZzc5&i6o
zrA#Azh>*X&wSnWE-_Z*tUbs)ZpnX7+LbEMzsfWnokm@t*Q~s~qs;m`rxn$2eUWs8|
z<vnRI@*^(UWEDO=-6{H}@|>0#8zpFSqhjM?kuJ-ln}8MW4HbpPHr>&v-sp(T3NzJZ
z@Hzvv8v>hEBKn#6en}K^fe+(D9oMi<znE};|Na%U+~hEn@<?bQq0#M3n=OT;(H%y9
zP}Tp^dA#*R2RTi7g@Mw9buj$;^@a%zjo{iqW;Hoc+A4<H;x^>%V#y3fE8r3s=Y7M=
z{jfZWqDvBm<-bFa|NLs+$K{0kM2|t<=-rI65cTJBP|C)4RYp}0rP6)XS(1{J`{!H1
zr50q1&_Pa80hmgaQOXYq>3kw_dD3k_b=LREMETIWpJgVqk|j6j(}6>*qVlC*j51H8
zA1@S&00Q95YC|pew>?GE4`p<rE~nA(`7J9V4{jj0vEJ+95t`sKgV7+D>6V?ESFPiO
zn}T=-3I`bZczULaB&d3)x~jrl*}<&t=B&NX&lUQg%;5^xMK98gnA6(bLR6s!P1v~y
z4LD3KQHLKQHq<h2^rlU(gtseX4WKuDl7w2@zp=rY`BKgYR<X3VKR`B%>_Vv@qA<B3
zp>Nla<OlUEdI`I0s&}SeGhQ=$YIhj7@}97CDM&mc;A}GQBWD-g(d)zG5$%%bfrU*>
z{${dJt68~m!NY3BTPsR(ek;W0>1huvl946?xgCXxKSt2di+@%X5lKgCxII-N(&DS7
zqPL1_yM^_NM<pIAz36tfL*Qg`f5EO^S4fez=85fLsY2>}I(2t7)_bz4zzS}d`ALyX
z7R>keuigJe9Xv_s)+JEOdK`YN2@^lgVs>AhvYqUA8^2?xv72M2OQ+yD!cv|CZVLjp
zb!r)~9m;JNy+3Mv(8G?IE~}*@GeZ^^&Ij-Mbr@t^cwqFns9)N9ebVH4xC#Cwp{lpH
zYN_|fM?r6=q43ay(_GePX!z9>3lo_?%s|8Q`Q-(;3%7rZt(Wako$BB_xu8P|>9uDR
z8+2$~y0oDkO=LCBe(~|xuXL)tAQ6g;z?^y28ryD?UjDVCGdh^r34JE=mS}V*bDTM}
z$1Z##UAPbkVoO?#nDK#Dye4@hB0o%RkylQ$+~M21%X^1T;Kuy>J^e&3cGCl+uWt%2
z4m@dVOT3UPT3ysA|LQ_KHnSYW4+cU+j{z^Ju__o7Mj^FbfI^kdiiMNv)fYKQ3=~#Q
zMVc}uuEn!nWTLYkOD@>OQj{IT#9&zjxd}bYW~Cjq{*%1X1jT!!2kLV6ZyZF`0wzqF
z3bq+2P->5{X{j6lt0bu#oo6p5@UG9S<L6{T`ccz%k_H@jGq73pUkRk}p3(dL`Ma{C
z2Rq9qcOC<tc3D_hdG-rkXau}tRvmBC^Hyy8`sR-$m9biQ`+h8&$bFyc=nKV=pkH7G
z2#~t&^WzgX4}xxl&AU?#<B;zYXF6Wpe~`Dhe08tgx$w|P7nw;J0DurL#xPg^d?eKR
zy6Cu`Xgp&%H%lr9pv}zQNc6yZRrG#z89A2CVcz8!C5j>MXqqGW<4fF00w+mKn8Fxp
zko{uq@%?!i`JLvnfEl=P8&zlg$0M)7NDNlkTIQ|ZSE0S`$hGOVQUH%Nhq}wwMDE;C
z?%4SA5+TamkJaltw(k?G7cOVNc>1Q$8X>EJ6%3F1t<ZUC+<4D=?+uDv2I-WXUHwmj
zN_cqx-s{$J;<gCkP^pV-RD5(~h9)g+Z0c(L&krhBWU&71AAW(`&i>Ivogn2A6q7&8
z#`_cVVA(8etX|}tU!)*4R<i?*6WPM8|KvGh92PdZ_VNp)%=kLhI7K*R8Jh0_b#pDz
zlerZ!JM3tM;lOY0hZ-`?lJ*Y_UHT_oUT4`9*o^%?g0l)KFfhnEtU%@V)(Id#NGJRP
z?>ilTWsInD926Eq41w$#oZMPwB?+7iShN9{BG+~>^O`Kc!!_bj-x^$v?E3v02Fh{3
z#Y31GJzi8?Os2gNe-?Z-2{m~XY;tJNuIck|q@oBMd-2OBUN;aav$OquQkjZze#;k4
z20VJS<Itj<q$Ekv!k;+?88Ck(cc|`a<jV(%pi#QPBJO@%tqrbB<(0{oPh~ty0};`o
zuO?Q5!Qi9;cO5kD@Zl*BXr(3pSVt5Gy(J%b=%!XBTcMr|Y+-*M0uQ@cTUTJhP4ZH#
zwDQ!JK~gX9CWZffObkgCSkTdl^-XOLer1`6vO5s<hBhqGNXjA-teN|_PV%7O$~L1S
zr$<EKVQJsr|CMyrMlS&Z@pw{wJ=oVUDGucY{SmJHkk*D{nICMx1W2rBLJpb>YwV%?
zfZ&l8OWs3HL2m&E6jr7S1400eTbCqkG18acd!`k6uOE5=g%%Sv;jxtAvV2DCWY!FT
z%aGi(T+h~423e}*V<>+B-haKl<-+F@S-)($!{<%#{xDMD38O0qZmoX9OZQeIbGR=c
zgwOQ(Gspdvo+}(<{Q#pdy*^Mt)T0fn;KI4mgxud<c~x>Yf~xrE9U26gBt)69qNhwE
z0=8BIZqwEpb_Y*Bb|1Q5ZGm}w7gLTkY0r`CZg4->3!`nEb~<<Hwa5shZYO&9q{>Cd
z-IZ0ByLFD%z_VgI;9IY0B?SP*iKB@-l?NGflph|nVZ3r*2L?_rZs5yz#{BSyI0U6$
zilFia21Jnxj_LHi>V7mM`EEv8l$UXH2i)}R?<)$3qwyr&QF2HNdSI)UHq6WC1Gm80
z*J-uhZLzz5&36%S-hF~);I%ga17XvpI=0Xqa8CnjQb{WwHdr(d!Q04e4m0ib+H8e=
z-11*hYc@t8z7Ow4{xN>*5fZhQ5x4F@)=uC_6O>+}`7E<Uv;F4`nM`P6#`j>oxiG^g
z=<6eC$My28j<mozev7}zgfvE{o%DX;K2$Vwf_4X7)PO3#lu`t4aC?QXaHx6>KWGa!
z*_!X4@@Xh@T~&Pq{$sOb2%dVJEjh*Cw!Y~}*v=A}l+BYe1<RO$=&#1XQWy&LdSL{?
z3cRZMkFw`$1Ga~N(cZoj=703B+ASmCat^bD!PB~0X3Z$sA<*13XmZYds805W_wI<d
z)eOdGq3gJmdBar~hpQsLZJc}>zmTEiJ|pBgcJ%Z!3-L>b5uG2hv?o6?UhBU^Rp^pa
z^7T6Dy&hz8l<ALiiU{H4dZ$`9ea2)(C6A26!xkSfnud$Y+DT|rJj%k<e|T??cuQ>>
z<~GdVQEj$E{0?3Q%7t{bd#mK(XSZd0xfui=!pbjmSjw`CLk5ddFn&+bZn@~S3hLWf
zwpWbYORDdN>puzp4h0jus*K4%ifZ7Np8)wV;WJ;L(Y1g|oj@dH3LQhbJVn>l&Q>;h
zzl&=;29#kMl;6mSJj^848L=qT3q>+fwzB95i>V(YpDcSxI!HDG^HCdvsJ5V{os`3T
z%&cCv^xvCY|LwWJQ}%>jAdTTQgLhRdo@j<<Ts$ej?pBCMF^4qJQ(!ujkf#nQMYUAJ
z8f0gb>^u!5H-8`gNB_XXVT7&Cy;{E;@8VpJ@v(e3o-N2;VlH|~3T&6YuFAh@!$bV2
zNSbdCGmJ)Ve2XLo291Rp{?*T?2+S#yfp~8w?xnL)%UrlJ`glfYe+l#hbTHm*KTPo$
zGB6iiT8kWbk}yk0+xYc}FbN2?-)M1^uw{_j@TsOhFPVG(C+sFxqbD;RG)g;I6oN7M
z;9$F$RUbzFC>s*8q#*$S>0yY)#b8c}pnH%bweTi&RXtN%(ejKVg|9(&XEbMPc{kZ?
z7Q5r`*4<iFn3-wYJ^9xX$)^ZD#C(<8X(v{~IJCkGb<82UTy{gUvvO>^XO3=)$UC~Y
zO}8YSzWO(WfILb|2?@uQ9@ELR{>cbUDuEI@v@CfMGInnrfTt=q*?2cybwbadUm{)p
ztA-jF(pFfQ`zyE9=i7xH=_tGFpd3IdiNkN0S?^!frr6YK_MngJO*K0GfeWC3^2E;e
zS5NbvFtPU@?n=n?jM+~|l^dd#AZ}*uXu*}O6F=a$CqLCuC`och4v!B&lw~;PdCR@3
zYy7HrtZ4PJQ0LVy)t<)20*~m?5o8Vy^!CHTUJPVOBfZyO%h4Y`0`GuVb~t2a*?g$V
zRgP^oD}ny#&?<Tjl4dR8uEy17t!G^&DSXT#{OB1CEo$lcgCd-yVi?KgRcjVCUD>nu
z*L10Nj?ow`5X;=FxZ1uwS9l1)V6H^}>YDjq;09_JAprcDpEr6he5%)zKOtJlG?>ea
zkU&|dS8tmXX03~y4{&i?nPBn$jW)nhd?PWZ;Fuo&;N5(O8N_u2WQo0yI|C<IxoyL9
zut6p}oZe($;NK}Ob1hK)>oOwO=j3{a>%X<)a9`mJOAtaJIOJa8<Bg7+!1>RT^fD-w
zU16tY(I*VEa*p8OzkTNLOR?}W0C$?Q-|r%5y23q#AU!Ht3gCw0P)d<7vf2O{){<O0
zk(|^IWco&Z!G9c7WEDr%(@z_l^xIj=3Iz9jLsYYZbGZ?{C*sK?xZ3C2RP&YQ+f%PZ
zzIA&CMf}d#oFr#y(#&*^9Z=Ek^a1)#V2G#D6M`topfU}uhzC-)h@RHOWWnZ_5om|V
ztN$Ep7&z8I?PlAJx0#mazu4Iu89qM;*_{R>&GJN$Y3OUe(8a)acG}vOH4jUQKdulE
z7-$vn<@uMW_wl_^pXn!|`?laiJus3oG$<q^q)VQ|BS!8EerA}y*nfmOO>zkgNJoks
zovu3PM;|u{O~ct6(nPwwf|B$!D0A<LKM&Czx@YoNG86nb_cD8S&1Z>nRT-2KNOl}W
z?alJOUuHZLmZSL(exPv!GPft+Cwvh$kU(Wty>(E>om_q!Te}JLjvjQs0sBzw+nk=9
zAq2d;eMYzzAn2>3r23gR`-@Xp?9br8u8PKaqmP`ddFgOQ1|`C$3wTcn7L8upbHNUL
zsc&WyH=5X{|Mz`D#e|J2w3^?_{bOC&Ld*D}-)<mG+FN-=2t^>$6#qSh|8oeWGXHD+
zLf;<nVf7=FHC7bH<uw|E{J!<yj~XIm;{}^HUG8`kwn?DYSVaj_Y}6BmtQm<ytsM{k
zg2_q3IXX%mi6lLfd(Qu=JK#k}If%_n6rjqKU0xW+3I8iz0Ta@;z5N*5`=qN@9gihY
zANUlvD5UDJXSji%!~^0OwcxK+fJT@GX{)KpEpl&<E?XJA*>17}f+FX<kS<jYYJ_CI
zmn!e3TEBAsE5XH6fEj~r0u($(;^QTZP$D^?2)GDwp>|stO66DdqdOp~1pJf0fHpWB
z&dWe>?u=@jw=zPQb93U}=75%%MG3L3pKZ7)y;&l%bAaS3|4J^#OSyI#+qS>upZWO=
zxTh-WBb1$FH8(J@+q}JBYwPpo%3&O{|M5d0eJJDPWc*eP#>Z>nmX>GEm<IX-;1_`@
zWlWF7z{BK^NY!kUA=J==8m`?v?~sT89=nE?N*!RJZ+m^%KwBCij!b|5{{6{79!P+T
z>n(2G6GY*k-)KKfk9vP$7K$8?!aPTzq!%6uw~>T$QHd}klw1xf`^&Q2TliB(QvKJ~
zJtc=C-G0`;FawC!I7dbIAUdP0lE2Yv+X5=k{sbLNMDd+nJc)`#rj&4{e#YAnC5)#-
z{uCF7zIq6MK>I?td@tj!!1VV>HBNR!WJD3N7Q;iL;l>YOHRa_T+CLU3xmOAO>p{tO
z_$+QNOV6o1RgwF}3?B;R!Qn6?P${HHzYBA}2hEIBIrYs`zhZ+XRnPp>NX3-wv45j^
z1UOfNyCA7&*LQkK5ob?TUL)5rnC9_Z+5rs(46?CNw+Y~nkI(rhqyMISpi^p`laq01
zZz@*fOtHTKaWge#cHgrQ+<vRcp2JVl(dqW}^{*xWr*AV6O1TNQ%<gL6Zou^Nu;5WH
z-2$*#%c4p3jEVYua;Rusvp2l9Cidd0|9@vv!8d<+Tf737z52)-H4IT?dPXa7n@yaC
zU2lp!0wZ6!v%9rhbCCb9QHPi)b#LDEw3%KLE>RXkouw(#A3~SUtoIh8HG)rvd3(K+
z``6KmkCR;X_oJu3J)^Dcr>8G0!j@m(K3PfN-6fthnpolc?}w@+m#$=oogYB0&~BB(
zA-cp|ScKqJ0$n&w;IJZH4I%>>DMco5Qzh?TBoR@>QK|gk#%2ZBT}8;qSsGtC*5k)p
z?+l4JY@l<i2m?7%77IE59n=<2H7PyjId%&}KS?usmZn@%KHiAP$xV)~BGj7RxXBAN
zb^ob;3ztkhdUSg0q?Rjcs0d*|+Y&H@w(6pyz%n`-8q06~vut8CMo(C{!#jBIiOuC=
zMN~ZGy4to}?sl2=cGfCDHbj$20@KI;b%Z{k#DQbt{r6VXw=~B23$3`yt=SMT(bP>!
zOadiU;`XbAe{~H-+J}eV2)-@JSP}%{?K_a^CfS`Pe0<V21=Q64Do?K`qiPhYXI3~_
zf~cg6g9K9L^pK4nm)%M=zW<Z%87ODC0p}R4V)H0Id>cwKdylH{%lmW5?fExvmfFSt
zkq_SCU}$geLOps|fOP$Sp>`lu>Hb&h(&)wg@9%F1{O4~_q!<9GpGOmTz2_H}z@JSu
z5I<rmNk7OITY=OcAE#=>{(I|eV(Q7-Hht$yDb^Z5#N?|jjk|q?Uwo=fj`<g8fb5VE
zMtHgfdVeH%863Cxh=treuTAZILyhC`)B(z|Hz)q*g*-r}3seojcbX;zp`Z~#AOl)m
z(_Zw8S@aBkVSScx{9gqDoN5)<yQHfdpAQ=x_ddE53-G;iWqBuUDk&dX6-M3ub*}&4
z#0wybFrl|6wRFQPV;@8c1*bE{6%JyS@~JT_WlG$82Y(avp#i*E0j2INvw1)DaX35`
zA937czy1f=f9=hccim+avHvj>fFlVZAw3#j-|Sy8>k0*XREMWC-o3l%&^#|ESw8Cb
zzdvO_+UlpptTsGVPALMh(vv-#NZe8ij-vl_q)#Z!^KV_PyUG&+mnuMl#?%Yi)VUgh
z&^bQ~J(Gdg-v7EX&~@{Wa?We?z7bUM(m&BL+7VO%lBQQWvpjog5xzWJR=Y_!P}RKn
zF9b(m6am~3E!?zyFYLuqVu`pJO{sTTKAZ8MUsB_MuOC&<H7T-0IWtj>qA7H2_WVn8
zW(OMoBO(VaQo?`l^ZLO~o<rA78&E$?o{yMZ#Z5#W?7me6m=KfyQKiUZ09@f=^A;kS
zAs?#K7~>2pK+YP}9?vi<9qRtpp0NIZ0wQl>9ju>f3&kv!Kt^g<9_7@7jkqWbbd<h=
z)@Go2Eg1hd?193S2dLN#BFbEUsn)xCpDupPSQvqbj7AoDhE?Ap)4`f1{^@mqhmbcr
z9jw2-v)Xl^<}Q4rqV|&qnkz|4tKDZ&UB>wSy3zJ8`~YgDCG<)=wA-k5TnG1fMmn!~
zfdqA^4mJBg)njP}6zBv0YXfeAVqh>Ge5z@6f-S-`GR<5X5&8{1b{Tnp5zTG$!|2JI
z{tN%(0@oQRb>=1IjRF?noX6KMcrzz{H9NGjlzd`mymZ}oh2pDd=*qzVoU>JcWQO(}
z7alue0p@>vL(0iltMFkb{Kf!vv?_TMC`b<eD@dS7UI4Yi!sgcx^C|kh7YfuSiD*y&
z`*BfhgDCZ`>u00?vo_Ku2J?LS)z!rBw`lmJ=o6m+l1NZKMk6zy{H~w2x1W<^{`cpx
zRAfE4=gsv7w_yD{Dj)}TJ|78aWj<v`f^sh!S*`lF+c}IN5pG<qIeWS4F?nJm?WFpK
zTyUB3mWLsZqWiD8r*I;2_S~1y?Ps`7O>jtCuh1n4B!&B}K11xS)!$egJR$G5BAu-n
z%6ZEE4V`tZCjB|T{D`-)a&I4Uj^jF`&)wbnsgqE1{a|KuJwWJuz|iJaor<?6tT&4a
z^ZDr&Sz)1yjpOJobinN6hfV4M9(KdDdQy}y7yBti*;DaSsyOrc^F6wTgksGHD{2+2
zHtc-$5>NrR113}VgWk^5R|xBMBL7-$E1tXRc!}{0dpotAX{1I2^4hO}fm7mnbgAK9
z=h}=bZu->}9zW+3K&6PaY!XTPisu728Bbq-&2-NHNd!;?YtOcC6>3GA@f4>hxLn6?
zGe3&QH%p3&{$RG}d1peebl>If$Ro(a(5`C^!KUs<iv3>~5aFC#U%tvv=i<qbA;T7R
z`Z^`@0BBHf6ECZHUMSvupT4v49dnmVq`A^Y1ThP}=JOa8U{v>MN;fi9&jRdwe?Ev(
zlFiOXo`SGEp=8`fW<Ep$ESMbbyT#tIzd?P`hR~gKmG=I^9U35$yo~zp`e_;h^moxf
z?t3SRopNTr^24zsLTIpQRhRHH&l)$+y<(2{_mKf>YPwL=fYAlGD+=*SR-UK__BE!y
zzKyi4_scQ<Yv~~{1q>d2>eyjC*zik@Px00XubCjo+H~O2@bVC`Uyn+hQ&kM@MBVF3
zI8uWQmyTCNi)Yr<NLQqntc%Zg9p7yz&nK)0aKA@qS=pOsmpn_IytH)MJ*C7f^_GF1
zm^-GVH}%O`N>2N};O?3R6W|~>>i3WNtuQ`jMB1v~SIYA$l$8(C1uGd-i=M(sZ>V0t
zWQcVaU;rQe_3h##r0?%4j)zk&x_u3SkVsn|6HTk)(-`WAzA07w*VB^X)GIIdq59W3
zzICMD|322knsMj!DU){~MFH+XCHeXn%;+f*zcvFTl`P!k4F_L;Z4~MCB^T)E0C+ZR
z%R6j1GJ+vT^ztN8No7>u`%@04roFO%4ZPliH_302NIyNp6h?G!Dh;B1E)B-7W6($G
z3CI&OsSVdZTSf)Tp1)V7tJ%`Ue#YxXM-a=<(HD~MZ|B)tW!mQ`xCn(%Lr>oImlHaM
z&&oI-I04hT>bNbydK0%@dz2{FOm<lw`aUjyFiH7~a<eb-COLIr%L)ZP7>gbA^0>%7
zTm>bvq>8@bVd_~&dJVBP>K*aRFDG9ePknvEWA15%4fRt2-0@x9i4++drn0vpI~7-(
zf8ChATc{-PHoVB53yb>&KX&#>ZF(6Mi@k;Uhby?*fu3JB%vhpr3m%Alu*~|l_@dlV
zD3K{O(@;RP0>%@~`9nyK$F?@fEG;i)_9+wZ9i4;SG*SCE?5-WNMJ4)GtCsw%Tsy@e
zm<hG>DO~8>r)uYe+sMC~^EUqaH3K*0eNKC-$-<FBD!9A9sd27q9X|K)$$agBe&r)6
z2XBZ^$-~mADZ@$eU)5{p2;&akH$Imrr$||d#RA88WtipONNa|=X?B*;@!Phy@^-9x
z(IGefPhscU0l(3i%YH<G{lcSbU^>=oQAo<ZBi+iZ;n@@JH6@Qy<LAJiuHJJ?W4i<W
z{()D=EUu($g8!*Tq1#l`chiQ&<VR5$z3_0W-5Xp8Vb&6r<7!K~;1zYUs<&n_$KUWf
zcZ33fRZP&%g|`jvd9q@+Z^LKm)4m^LmZ`7$%5-eyd!du_Mw46*-QMaIMjf1f47QY!
z$+r6)Ovz^{fj>NC-|ifgQfJpFVB_Gbdw1j^WFnZDEQ0xX?=N~ab5qvVxJ55MQW>n7
zk$Z9TqqiT|(#xd-!&Dx9qS<G*>5fz2wf>Elo-)EcB74g%z&FaA=_R#s0#3>Sq2d~Y
ziS*Cy+e82e@=zt^9FbtwD2aoV#MhaDf{m$30_4w8e*>w%6Cl1M28+6Mue@;NB~cC(
z1;Ynmn=2_w*5)+N`we1DFU23+JMw(UAkiQySjn3aqGo{`$br<yU<;VFN<N9xcML=l
zw>ua(t#zhbxK|WFMl6DlyaeWpL9A+I^glMyAOPcR=3G@YJuvud?0eh1>Weh{d|v<d
z32yARr@_&ICy+hdkMi0Vm(N{tWQ3?&q{J!G7D<Mi>4>gx*r%V4^L?ow*J=sZZ@!}u
zq2Ll$*9(F|qw?c78$rAIlqxI1@yx#m(!;YcR-P<KeQzhd{RPCkwJc<umX}!U?(<zU
zkM%@y%jL*b=ZcLGr!g+cV(10ta7h=@Jg`X8BB(>%sq4L<h#5Ib_R0$(V4uOOo}t{r
z)h$6%koLvi_WJrP{`_C-EAA7m!#|fEU>Ap~PK|%bbwKJ*%DOA<M)by3o#LAuNaU?^
z(RD$TE+mF?Sm2di8QZ@Zg-aR~8VQz{G6yKKUlluxXry^uY&!ZY67Z@h?{@ba&Rm7x
zY%?Sgg}oQSMn>fNvt*k}rAo2iUrhdjH_2;~YH&NlkSRCIh9vKNis7Vi<VViZ%awh6
z*c0CKs3)c;{#%lk#3#ONW!fIea1Nc6OI_@4rA(4m?ECRaypm*@H$H{7^=Bkl5cd))
zt(M2FPcUK!Xz#Y2gBbOZvdSo->SQ`#-20~jbLJs^@2&+adnBTOL^x$yK~;^}wmoOh
z**CZF{m!%ANFpplFoUVol{qmRq8XYJ^V?dv$Jk4mw?ET*+(Mbta>(uGoRcL*8Rs>D
z-?a7e#lS5{ggFnekqMn|1|Aba+_QMKvEKU&qZRqF|2N7Z`%uWtQ`Lo@<6mC54yYS)
zH@^B9v~Z$7b41|k=9PQaT9#nTu#x8S5Q)TaNhe^Z=FoyH;pH({H(yjA$}_HQEG-H>
z+33lJN;Y|MjL_@xHN;CS=^R8?mG;6N0mS!hk*n+PF}e?Ph5j^IL!1<Q`wZN{dTU1<
zhs>$wA30Z_zeWl^`dl41C>KF|VsXRr*oePGU-$>U@*Ie!Ikt?=OBq@u08tzQ7vDl9
zBHooZ-L1r}&6HW$(Izl)^IdVN4bOu(x9W0XV}_9)`|mMpGrZ%2=>0zfN+4@th?Sa3
zo+=z;&()c|zmje%JV!!JELPYpBP{M2cbV#$!6o~&IHJ|%otSkwXk;x4xlfq#@K^Fj
zj7a}I=JLZ(;hL+VbwJlzED!E#+<xW1{$;d965&BIZL#M<n3B5D6!HdV?iF7m8>7do
zKh@*KP=agE$dT9nXr_yguANc8wWsnmas0YDt$s(jLiy)>gQo`f%>|$uK83E#BSv5m
zDcmsK@AykGcBJpqrTf6#@+|enYiZKt>m9y;pv=#a7`=~a<5y~r(5764kO4f7lZB1A
zk-wWz?=L&tCq>npAjhOEnlc~w*Y5nGA(C_Pz!HrzGap_iU+vz^k1qAHdmt0TD9zf<
z{GO*h_Z6HESJ7OUbt|C%og3o9<P^lBSjZ!Ew}D?&45xMidwdkXynwdhQvj{4b-{r?
zqgpA<P2sK?C{UhVgf=ce6Hzb*2j<FXF2b){Xv$H5rpx`Se^!!)hE8F?#uIs92cac+
zyiZ<OJqvDRetD(1=DFz!<74IV`H6f`Wgk%mSW#Sft`ts;HiU@aI>F8lF^fW2T9)5}
z=?;Z&6DBHg6W{z&gY*TYe(}DUzf)X7lltjKi5^ezx_yzo)HAVmEH#X?R#EfVFZoCB
zT(ai-9xEMPzfhi#JSU^TqTR*I%IY!c+i;9C<%D7J7sAtzi6Svv@f`@t<FkAp-gm%l
zf%S~*gS}OsWPT@v^+|j(w+t7shy?<6c2KSZ6b1T_Oh`)%`;vr|k@*8lWn(Mu%1$Xu
zN3K3T=+~oe{4{ND;h(vHZH|%O5GO62-VZvMQGPLXgT3i&O=^RP!?+DDXj$Zq+QU*G
z;`iW!2qP3N(!aAC`xP0r-tJlD33~I!fc){wLlM^DEU4a1!t95M*#<YCdS1yv*FSWT
z|7AjOaIE&L`()WcU|QAq@C$LFMWxLy-$U9`=c&AL&;_l2(efOc$7k5}{vW4e6A?5F
zXYTN&KX=2SV>zaHn0WoOL856%@>2;Ee>;A*xHoG(BH4uhI;Uy5=|RWh5yfLVdf&sv
z+W7``mmOL<;D@d0>VgfG=Qlw53lS6-vt*}c719^>eTq+pW)8p~9dm`%2jwp@TE<%3
zj@FIQx_P95IpV|r>P9yPMgH=WPr)H#4tLP`>)sjHmqCxuxJ5Zl5^yGS_76KEd6xuG
z6EAybZuVL7vmI5J4c}#^RM`52{24up?Bn+~E16w-wxfZWM;`q;=Dn$s;HxRf)Xq(1
zuJUm09raO*Gb|qeKRxtFf)6xSIlN@fcvD6y_*`!MX!RF)3w-g$_xHsw+=fnPpARg6
zW;i@G%=!fs;RA<_kfd$hxgY&gJfEN4CLE4SqM!_wVUP2!@+SZ^pg#2)Erh1Z5Izo4
zaPc@r{-R>~!jVqWs`8v=&9q3ast8>uu`il|a}3*)ae#aG&{KlB`2NduE!TH?M)F{b
z=U?9fEW%PQ%B~UCcqEaIrxE%-K1C8`uz`L$h5-f#2Y)d72X=Nw0}6~_VE_*wQD#C_
zy7%&vJ@jZ~n4+Zxx3XFJOYJ13#K=rDc0JC-Y{2$|2|SXQwbV(o@A;Y>5{Hr(SYr>+
z$oA;rGH)z#C-%l<!{tE?Rhwy0#&VJA)&0gyko_`KgHY9H6&X>{5ht!(<pX|z*rz?%
zEr|7Br<~c?7l<`V_yiLbzJQ`&c301pd4f_Us_VLS4GXstz?ZqG8`a1!&n{1Ww4-YN
znYYJ9BY*Z)mkiIDw>(&8OFK!vmp$xV@svl}qsCN`WlL0n>3CY961~UJKd!1}b$+yd
z0mHK__*IR0lTG-1J>ve?H>-oq>mfi%0OgV#G&>twuW{<i#Tr_qa$s;)bjbcBBJ1?9
zWA~#p`~X~pnJ--PL*1eWMEm)Z2QQuAOAXLWg8%MHzl)L`M68By@aBdCV+}#>V&<s=
z*Wc6&H7*=!YDz=c=+2QKZqGVSO^8Q1T;*;wGxH3$lPYl$Zb*!fEOLBzG%hi`T<v9X
z$w#kiOxBYa|4Z3VuDiVP{bkSe1K1vg0O=YE$FS3+Bu^f;doHDF_oTIx1R`(Dyw=Ga
zzYu!8>v#_!mr7J{(^Qkt_(KR+<a1lW%WuaX8%fKC-?OrV2<5>*&dn6tMv6uVLAtit
zzu@HW>U}m4zqiL08N<@uvAbF}H;aVxV@Iy8Y~8B9RUrOAzG4^B$a$$35!V;-L0pn0
z!fqRJ6WDzoJaRB^+fGTGIT`F%r{VKc;*@P2FL67EZM2dl+$bkEBFiT5973cGS8Mt0
z-Dsgr?U&3;aRH(4UcrWjKwK|^n)Wvv&7<LI&Hfc-Y$BTdGHwisEl!AxZ<s3=;;9jl
zv3`H(!bh=~SUSPMVJ4naz{F%$;A3kT);*;Dr3t1UOfD}rhCHym)T`#kPiv;z5vT4J
zK}GMB%3&AZ>*QNFPC4Cv-0D{le#Y5ad*-!RX__q)e*0#jT(8swL%b$_fm_Df)@}IK
z@$-R2DpQWEP7<$kP}k?4%zrLzwVIQwa_V|gAlAq?h}dulY5aycTon65w?2wQE{$9+
zL{c4Ce(u1XnZ^|KLpeyh<yG;o=}TP14>5@=9i}B4gblm(ykzH!3njV#g=?9G^$mCc
z-U(PGmM_sCz61_>OiyV7cAFH8a_Wrdg&$_b<uBd@8AJ!i9Ja6Dx~d8pk<WA=N{hsg
zI3cbkP=Q&XwQ<DGpP{_B2+6s-2DY=D96i%I&{<}3!MKi1{C4M=HyY5TiXvgy=yg5#
zU;oO~a!W>rNk0;34}a=BWxRW}>1ZsNhDYnw{ZLWcx=ENLz_dY0ff-W6*G~w@pAonK
z?i~NA<e_BFO`%pSmbnj)WhA9LA!ypDm0bXzKvDZcb4}HBMz?nK<xHKDbs{dGXj*+~
zPySl2$!hM+vSWT}z%q_G@`EHE_Eat=`pZ_UtMaw34@AO-gIXw2g0$It!ENF$^UY7w
zN2h0czkos_Fk%2D8cKxSU7cKy@UO8}QUpapyHH(98DbaHKE^v?<8qkkC&wus#+0p{
z>b-Nn6NG9Rl)*!%`;j8<TURh_i|Bgq`KjK(y|>f{&xjS}wc2(t?VCISk%MgL;jp}|
zJ;2dol|5Ot_SSp~-G=V4pENEncmd2KnJ9PeoRB3hRS9HjU7Q;qb^|afA>#}SeR-if
zh(wB5|78U8{iNLCxH36ga*crImcChK;i}E_JBfQ=^D-SE?YH7)&WTmK?Y*pyOUe`C
z`zTO&Om+(^NV_|G3+N(#)m%PF0)|>0ZvxL1-usR&9Tv}Pux7OyV>nJYCqSvIbM=<y
zlTcF5)dQc73ijic-X2VXDBU@q+W7jW&ifvBREZ-l7Z<leZswxW0vlI<xVuJfc2myD
z#yr@<r<pTq>Z_u6Vj{f;9n%DE#wPN`{z`3fW~D|-P1F~?Wa3@Jj#LOf^;>-mZ1`%h
z66WbCW?YoI3HGP>W$$-JzGpybTzfR929-fl=26u&tDX@;=Qy!rU#ZUBcepn3<@<jq
zngpvt1aEJ3FmW{){h~6I;Ze~jWH*IA(^l+^Fr~HXi3ZyL8EW8`;8A!OOBf|k*|O$5
zJ1~x}fP?^>7qRfPGFSJOz^$j>ECy8t_)#$teu&#NxL>xLt6d4rOejJw4$3MAYuNdQ
zK5_!K^JfAyH@|$9ML_il2pE|wT^Vc^d@2>OZpzC|<+BZP;$S@*<aD+KC{wOytKBQ0
zB>?;u3kV=RfnBAl%Xtj(Chs1)-2}C>?e(#Ww3mB=vLk@ty|ZkDqF*Kho3|gee%p|W
zHh<;?0S4~!cNy5utvYlJQ{-u{#O4g%J!!bSeoGa7yW?fe&-Y6Jmka&*X@+%YDJiC~
z@U;Z67@Ta3cLlaKDziQI)dfny?TsHnP*_a-X?g>RYzCb3xDkl6je4Je-Z^>eI<N+O
z&wo!q1YoVH*{n#FQt#199oU7fI?BTAi-j-DA1=0_F4Tjbl@vd#?Q|LcSaU59WY_$J
znO{+*o`wLdg#tS=K$&kI;t_w5lg3nXx_%Nv%|AwiTeDwz`?J40zOn>-R248A9(lOt
zdpPz1hEn&wMQQbBTHr{5ZAI+^0sDRTp%onE$x0PwteK=>Tk!C$5YqdEy(_K5?V-E?
zQtzjzdI#h2lIx<tdT_BADF=Yw8UmN{LkU=+c8hCc=)pZ57^>p#oL?mKGjNEP0nOqz
z#WRLV0}&`VG?}vi$u=9gy*P^BEd5HW_&j$%uEc@4bA~?q;ziU1`;$<$8-oERlt{XP
z8@nsF*?Cl$zjeFLUc3nGYy#^k14>>KPFlwbuT2PNupqMVmmgV-3#foLzQ-O_JtHtd
zG6JQ|Ap^I)$G+72XFNtwasYxLSqeXpR>nypF546Ea}GjWn(wCxS7`2zM{e+?33x`n
zzv250$|EiSpI@H|W)0fTW_sn*Oyj@DNKf7bav;W?MWkJKgJJojUSn|`LpJ}KEx<#6
zd;xYW4qq6UwTl;IS(#8mg%4qR@NhwsYz>EY;bNd{qAs!`{r3z^Uw#vvXgkR7C~EJ5
zfxX$VNI#T>bKX~%L`%M_d+YG%9K~ksMh~51qM}CN5WwGN{VwOXT-b0wcr0^wFTQgK
zh2H}Mq~oY0Nmkmje8)6N2@#Sv41#r18Adv(!1P}8a54i>!}TidKl@L1lo|$!1<g7w
zPbtx$nz<LhuM7qlE8^qLRYKPtbg-^E0ar}IFkwuxWg!o6hegP)`|4z5yorPJBhQyb
zZc3tUqe-Zj&UAu6>)si4?4r_VP*XB&jE`JpOUB&l-*8%6Q>Gry0gDAmG&IZlFAlhc
z;bEnb?_E=yj^Er7_2yam&f*aP?tgFiAWSuXz%_5=+2!s+mtK7UT0$cS4-@xl+D;pY
zmP0S>=oEqGj-@<E=(Z&2lz=hN+EK38-$I^=^{3(EBg;Ie$XS*TumehgpY1?%?*fYH
zz&2?51=*KEg2jN-{p7st)(&)G!u+hO^~<&keP39uDw$){?p5YSg>9oSWv=R%QcEO&
zM8eF-P2|wlCSJXB#A`N8+IL-Zs_3as*5TyAu`fGA-utWHmG%&{p3lOa$X~;%9X~!U
zpQ481uzCQOev_U>NR(V-oFZ+df#0dVgtswE6(8k7e?YRsDIZk!QOlfN=8&?t8daYP
z%CaLc&qcx(<*^6>(WW^il*Swt;2wVSl*Ke8Mb|sBx4)iyz<BV3qm5}5)F$hQzG-?2
zO_lLG%7^ak{wyeV;W-M(oCf$RH?eJCO@fBTQ+sXt_9;{E;ajP+KbUw{qBMd(b!N!y
z&5c&6vU4ma!|gAXVbkP;wi(MEkm5i3z8nFVmu@$LqVnyt7vve_HT_=i`-CJINQH-3
z>(zfuvr%P1K7032X7&4L(B=%NsSNBzPetaC*VpW~4#$Tg8FOg4+2j}Z=d}pi`ZA|J
z86WF@8E?a~8&s&uwEOXFZl}AHW;<^T_}%9Ia}VHh)lWaj><(@~)S=we)osM>IW2zW
zW*Bk%a=_M4@4NF|MaIBXELD`CD1O;a@qGu{{rh{dcpDeK<C5T9RDc_#$lSouy2Z62
zjI5Q18~8D2Mnc!S*77Q)z~udO3O@p@(T?}-=6tOGVSQCBO#;Y7*#fMwV9P^qIc;l}
z-6qsm`jL#>%0Z|6cdpFDKHSms0SssTpD+Mq?LE<LF*XX&HN}{h1{n;v$GEIvUpm{c
z^xcdTNN95a;4-G^_Q`MzvXl>u<e^X(MCMZ}j;BI6bQsw6H;PORL^DPMRtz$NzCe+-
zPoK7(yXTG?Q7Ho(#Zcc~C+7i|6dnK&fwYXkv<AEU>Q#jTd8DYG+>Vv;Jh_y=(jW0v
za@vJlG^o9zB(D;dl_Ul%NgZwQ++z|q`HBc)kuEIaA%%v@bTrTUp>FlRe@oc#bR4fy
z%(SCjIPK>%=W{gTUCn9DWV6h-<r)F^hK=>}#9xjzW~_w7-p<I|z?`88JhHCuNSlom
zSbLK)e%N6FJ8p;ws8x|HDTla|R~7Jc{N9gHb0zS@jTFHQbI4q+T6-ATAHON>u1Lx;
zFRgrK@IBt~yE{nmE!FmGI~kt@l>V;2&xC^0ATy-j;<kTXg~9f`v|IAR+c*Z7JFbr@
zMe{fwn-z(1+?acN5tzYn0VJjVS+mjkLJ?)$`l^r<KmT;yyl%F-4^#fx2X8m?k2ZgG
zUU+{yig-+aiv6q42AMNS`{zkDX}L>BW)jQa@C1r_fGF#_Ml&m2{LI9dpIr&#K>K^;
z*VZ+O$&T6XlYGJ&K{WyI$?O_hZjjWw5?D6_QH9G0kE&th+nBej5x+ZylZW&`{}nGA
z0c;E&?n&((tDEnG9U^$uTXZ<au94&J&qQIux}jY)IHWqQ&34elV#wEcYokciSuB8G
zRQ2{*R$#Ij8O7kqP`I9p_xG1$13LWlLKWe#eV4QoQB+Esm?M>=SbThA<WrG)FTOEj
zSS@5jVz%R0^S#abqh4odJT4&IVMMV-;y2d>jj`a|^>e*xbkL{^f`ryr8K|-9Zl=%P
zw(J@ohoIu$jZpRmSnef=HNP5}w^1LMMpg7*Ni<SH!w`g4!E7=*k%?OW3#ndr^Vj(_
zAdmT55rP9OV}Lyn>?@z3tgUHXd7~E_zO}T$8Xru$!_U|KbiA}L>?gPwyXU{I>8bwf
zq(KR7=y*6XU(E`jzt#rJ210s6z<x!IBHPI?6(jZZ$L6H$!`2CVz7XCokCg$=ub~fR
zeG}n(yDq03<P9a_)~CZo8|-;cPlx~b=y{RpaQfKsnVTc5U$>@Imn3-^b&a>sh{0`?
zR#%*4c(u)SXNlzjJt+sMSI=`VgA^D(gY5iiTBeRr*v2WqP6!?Xz{|P^-WA8jBv|1i
zGwa&decC*{UCgnTHpo`-<=KF=Il<itB~9xO<4@oE(lb_igNTorsI{0Hwnoq7C}5!6
z0q~Eqt0qmg@Szt%Z#xVz-#q0oBBbChOsw54#|WA}>?N98SYfe25%hX+mCX;*{*=H2
zuo(@-h<q@>X*7B&?wVl|$DJ?G5Eq^62wh&f_u3Xj>Vw5WT3{}>#!gVAg{H$#WHY*j
zNT&3xAk|4C*l23nRu*+-I<P6OHMsw9brVyC1sv*DzuD)C#Tr&Z?OohB(=S1m@17lD
z&k*(UN&(iXFXJC%(yfo(W-T!ooq%owH;0%BKsy!#I8<knAloX6?AbRYq7$i<92~ko
zZol7d#LWkJ%%6QTmY)x}Ev(i_&uq#UKBN{RO>%PfDOMm^l+}p24df@b=*!829rDVV
z*tzL0L^1FcEiMwEfm=;?`AG8>D1a|H-FKZeUBLGCO1vZI9QE!n_1)^>AP)KNEqa~+
z+*<h+MRdW-DFyZbS3YGY2F%^gur3DPq7Mg#&Cy|G9<BF@vR<gLcUUwSW3Le$PGuW&
z%zx+f#$jW}y!{EuQ)32oEZf7?7n{ic;)I^40!`2b6q%Y}UF%qFr&BCW%4zaae-@xJ
zaPO|ML^Q*tND0x>qSK-kg{KjgNBPWzAp2*Occ{v@Cxc=;9ZH2vpD?<eVgV6ts4&K7
z)cH#pmHpC(>Ar5x;h7N<*gef<CCGh$czAvI6h7kxIw?1H)oG7qeg|lR`4a^ikKF(1
z<w>^<?1EaijJNKEw1knvld#C>u0Xn%`1_~F;C*xUs<u7jqeC%RYejrLgCb5+OtcIJ
zv(tl|c4(&)7IrB*N?INjlpus`cTYB*a)T%oF<gpGG?bMG+jWH(v4UN5K=5gwmd$Sm
zCZb`ac-C0BMXpj~=KWO^X&w<yI9~n?JdGePIjED+P=`6WVXFB2=HC`n1lW0_90<Sg
zUk@y}*Os;M&YO$43qsRnGS~ITY!Pc6s4PG}j{t^Bs4~|$8tnRX8ggez=Q5V!aO$(O
zjpTY~Q*$7s-^%Tgw#PH9wT|N$vyr?b?D%K;#OB-+>_?}?3_9SFlFUyut(r9J9wl81
zD9^ZzxTOT<he{x-)J#W?;Z{^SDy)^yb#%<+Ly!`1%x8Z*?e{5gn$H7Jr8`Jfu#@`b
z{iEv+j}Pl)X2L@Mftc6VkWNH7GF)h|nVaDAA`d6dQ}xRRUvEz)?sRMCtBoFolH(W-
z{FjtwJ{&z4MLDA6#01T)P2sn2tU3l<`fTuk9iO7lXWWYiX4j{Cu(NNA#ev{4PhqS)
zC8avnG>_m+v2uibW;DXu2na!fZbv+l2RBx?(^A>UybmJ6Ubsy*JaE~FR>**{^Me4b
zqL`>#tH>`2T)*HchhknLxb}{*T34UFd2e`W8TNA`N!!7<N0o{6ioRxs@7wtLI2^d8
z;k$ZPu$@>L9{E({9xYNobtJ}fJTZn!)wO7VSe#*^Rd8ko#yUYmV8vV5ujMG&3kb_o
z1kV;5B7k&e5Q>pTP#;%_^@L}xjk&NA_!U$_Gz|-NdqA(7&hWu&v?g$MGBi%GIp1P#
zz_LiUTNCJ2+mujUpz>&H^f2`<X&rXx#>a7J1s98KII{WE2@QYz4_WCS_1r`|Y*r&r
z!pm*BtUx?YJ(0g&0Py0I8nyA|<-p?EOQ&eW{wCRxxZQuas1nH$o;OiOmB|I$-!clX
zjzMq<$veTGWy{kv>Cz_hfz8IT6L)Lz^{&VZ3<Tuf^>ZCJFY*wn#-E$7fXbD?UuXeO
z&_VP=p=uq_cU=!tsSbzy5wJq?)0d!FddVzQImT$@8H8~d^agAiL)9CmPE?_%#+yIU
z9QGnPc$1VuRv^$OH&1-VN;iG}rG?BD8eEuDU=w4G#eO&%=J)g?;J>13Eg}Iy*59xq
zJ9D+^u@?g+O$#}hMcSEb?8!4Ij+PjoE#6{&oXZGT_8I7{eykGBEzzPRl%y<sJ5S_g
zQ{M-KlP2~$3W+_Zv$ImApMoWU-QHPxBLq(pYj~UrSU7->9s{u1oX7C4-<Cilli+<N
zgc?mD4`rc@8tP8XQ}%SVJ(SlLzqeD(dcE~i^umC{a^I4J>$e7Px$T7;o|Bj5?}szB
z-fs#$_?04m<2LPf@kx?iacBY$nSn>{t60nEW!s|xw3nxyq7!o=8alX3itHR05HiZ5
z225%S5L^i1U_T=gVAbfC{K8VV+e)<a89o3|tWGN-TFk(iGQl9>m_B+kxFg~=2hfNE
zD-tr*ZgiIRtT!`YcP)&l2~~<@xr>JvwGW%FM=@~0Zx$GeT8q!ZOPKr<XP36>vQV+X
z1(Q_6Gp8yX2D{&XG0trOx9>lTWZZU!kunT`-4oz;y~Rmsthr?D#*TfbelHjBM<v=8
zQ5=f6@^TcvSfSM^Ndu-+rirlj)jGT@aId!vM|NGmVWtl+WRN^14-OP^gN%4Uyxcjw
zoOZl`o0N<|qjyn~loJuzN)`vCHKt7;201XJ#^&K4Gxn)eBK2^EuDb)hv*|fIxF;~x
z{cQ5?Bro@-yA~SkoKSN0by=u&){D>s_i`&wE&|bd6pZYPgd<C9V=t-$q`COD)@LqI
z3ict=klS35_P9<V@1ghJ%8{qx0B&o#htJH}ckFL9x1J(ZUnE1G4IAi7pRUNpLb*oH
zfWI6cf~LO|=qDYln;Z+=^x$AcK2vh{kmVc!OAdqPPSf329He9kIM^Ce;CH5p<A<VN
z#8UIT&)R}2HH6mK@3b^U%w7sWYIe@^@x6MqGgb{hHM|dSIbI;(Vzj-zJvT5L-?+Q}
zl{2XUB=gMfQFK9FA0Ncb7tzbyrwriiBt2g>8~yCVp~}&KtSIExPiL!mf7@P>glk!r
z*{I`ZB}Dz9xuBs594SD4?#}6e12$k#bKV?iV%9}M7##T8SrPR@gO^>24lTQw;j(ou
z;0oEs;at?4jT9Ln(7E#EoRahbKlBq0w&I508bl{cMGIOxpVOla#ZX@J8f31>7TnS?
zLZNYTsmUhv+iMzZU)wBXHgCdi&<KRj!&t(_`caBWsK)|_7bz91kDF_0DPLoyWJvG4
z?0Z9xxzc*gLf>UWTs9AN<gp`UL;_YhBb4%`l0LhCzt+0iyQBmCai(pt+h?H$>G}+i
zw2Ulwje<G66?QoHxjMJLU?UW?W9OC=RHpfELHbUg9j=+1s6dzxBoV7UpN|*pteiBy
z)-4X)^}djP`nogF3zS@dE{c9)OF5x%2(Dtcu$f%pADGp8==t=S@)`C#R%e38=5bW=
zo{)IjUNSCpRiYxIWYY~2Q2_YnPpJ4AHwfV>6ayP_F<PB6iL(R-`jftvoCRl5cUMt&
zr00;7U5wm5b^2B7<-=QR{hjFRV-{6oZUqp`K}*Fs8q(&^b}&oKuABWB`i)Z;7?_16
zZ%^oWK>>6~^cWWg0~<G%^*1J@UK}ZPfn~a9gLh}g3@1;!!)3;uTzn>GI#hOI1L}gq
zPmUnvyAOn^wmiZ4$@2Go!4?-=H}3T*-GDZ{hHZa_3|ALf16z3ar3e5E1f!6)szqO`
za_LZyu_}N)qQm*U<iTLkcD+GC>WWpB$pWr}=^Bt$0ymX}YRhQ`z36<0-Kb2elq}oo
z68*f@Lq??^3rA8;-(4JZDd?fF7(@S$r!(<~@_YaPJu{3k_Uu~}*+tf(3@Vjm-y%EN
z$`;8wV@p}0LY72i%UWm?Gf3J*Qb?Im_I2!oG57a)e}0eOAJ8Lb&V8TzT(9f-dR;i(
ziG|Le1`A<38y?d?{1MXUZONQKb-QZw+_Twj=X$dbN$Se(csj}0Ae6AnUaf&kIhnsm
z@t!|%>dQ7EV_i%@<LiJb(qSPX(l?I!5&_6(ZonbGVyCZ;`?9LIq&P$j`<vTX%6TId
zjEY&!TXgj!Qj2lk$mr!>r)QB`08I`Trl}vgAo3=)8pWN?%=rKv^qm#Pe}o(DhPx{^
ztoDxFTb56Jkf{O-KZO2#?uUrM1tqq3$O2S#$%ol%rs4bHH(_Urqqh)R;~U`E18&Bj
z%6+XnSK70VM%c4g58I~~lT#b1fqy^lqF#+gW;8e-P(>PjM}G1lxmVx)o-UekU6=-R
zoiAz`q{wGyO@x5P%v$-^lebt)%ib4Bt4`!qFwqxF6T9?0QcKZxKHJ1D_(2@*eumk{
zZkjta3|d(r*n$TqeghXvUwS}?OHLEB_jJhh@hL$x3a#|a`rT7OTA@+qYDH}AUp;jS
z`DTUQLLPno(;v_U=^S*?4&erm_Z{o@_(A}EbSu1H<~Y?8#^%pco@c^F{YJQL%k1Ob
zJE{@1ogqY<`t(EW(Q%%#5c~0)PFYsp<7D)&+M9E7@D^XsZunJP+>|@XO8i+f%r!cC
z$O+4Mo})ZsWo*Gh%3$Uk<eV=5&X9G13)Ge7r|#^P899b0lP`8m&(6sRxZdvAb+Flu
zq`>^C+s=LgL?w}D9^Jw-!JN!0^`AJ=U?ZMkf$ID#=<hqt<go`~A*xovfX($q;V}1Q
zY7^RGrp{MP9RYeOlX3PeCpl)&BHmu{Y{82I(#F<%;FF(43SXEqd`CWNLm;Q9)-F&w
zbn!UH`?QM)&=C4w>1JMzdGWsmciI-s+&k3r+T<(Tl}cpl%`2nLo_kvAjx@CKLw>4k
z!o=3QAqNg~TRI<ln4*qwkvAdy-k*Cqca_{Q#{DkE=F=f?XKL9XZN%$9Zo0*y_GCtd
z80`NM2HPB_08U30OAw9VHuuv?q+rzQVfKlx_s5AMwBe<<HKN;INoRRw0|;O89M5NH
zzhebC0(%XTzwfHp=YEQ7v2P95liPuQ=h~GLqw4-n&FAM8F+Rng9BqvJu;8rV24lyW
zxqAQe=ti7L!3&-}RpHyhbE`6Qb48H`<dOvq&R6%YK2L&^C3M<d@U8sE2W#(%82eF}
zc+JmFEP@!H4;^`gH7sxO6|SsQ<nYq#tLs+)%#762t7F5L|9)Ly^0N|!0b6-l11?g!
zxcUcdBd-2cu)lG^yuxQ@>A&j&)uk2rN7qw3c8#fx3X9}0w;%>x+~<ei)3u|W+`t=o
zadh-R|3|Ga0B`gM?w@O#w9hMRN-VrGiNq@t|GM#GpaI!%WjL^}dhim4b%qP5T-=O^
z?gSThd>J4D46_wb6zbUdc(bW9^VYcmsv@eWEW4iPqC&jVnDkKE1Nqha#-B3UiNe+9
zK?GL0t~^4Chzx;fe6*s2X}X!^)9JXR8nn_!aFJ48=m*^kEcQ>GC5!71&S~_|m+&FG
zNqAV%kB-)l$D0uFwGJLi5uw=!UJsQX|9;boDEAx3RlUVEb8`zAh6Hm|a1h9a87~Hz
z6Gb{<9;|u^j~!nQ=gdWhFX*6vNb!tdb@kZ=dV7L*(EN~%eUp#&+T2TSKVUlFtuwld
z#yclrcQIjecM{)5jGPk<zO~qUMur{%e6w*sYh|%m(ZJa+Tojd-H-HDNFv(lI%LxOJ
zq52Z7$-<IN1G>PGOYnQhTKO)I5F#Q|jPXWd6-)>rMucx)32H|Z73dDHSF|5+?!Ydm
zNxk(0PN4>$bfD^IqyU8l{Ma_UxzKXSI)2A{?;;<yu>t6`h}spM8p}uSlz~8i9kW+&
z!9SURIbFq-LOMkKVaLHt$zV{;@|!pTc)suQ*WXyc`Gwrr5>W@R`_g@VEn(on5gntx
zyl|Hb?+l2^eL@pk@wekY`4GaG+y*MWz~2uPWNdlFbG)-um8Pi4mpp<DSU_(c!2vAb
zpf@u97_YgZ8xng>hIGXna^bTd@q4S{IDZ+ZQoj#WEtO{A8m;X9gp+i^iykNvz`)n#
zD0^!iqIF-PH3q>$&-^t_GwY9xYhQ%$>J_oV^ee8P!~U>E45cBi3!By0+gOt%V#b!1
zTsZPI3n1Vr>GydVN_WQ(-j%XbT8MOsv3WoVGz5B(1v)3JoYi3vN8cDZM%_3p>Py|E
z%CX|$w}xde;&ykg-}_a<>f_tTG(a)Y=TBml154<C$lB-6Wqlnjmx|nqB;4t6C;`pm
zbG<Kb0QvN^xQ>a>EwhL9C`vcd@fYF``#5|}5JW)<wc{o`h{oAt;GSlc{-TZdRqzE1
z)~&gT?FlRRxYC`-N><6shB=4-urOmozY*I0jTPyJv*hZ8@y?HgBYrjIiTLgn;Q^}Q
zi=2Ccw5}?Hb+u0-_+Mj>e#55w`fLKIqeuEXffe^Bc*?SmPQAw}E(s0=thY6c@bMmc
z3jY1(GHXs-RFw4wBBy*#x+>ugs}Fdl-e7sn3)K<X{Gh@*VLmKetb`qS$|7`_PR|fp
zR(#bWm>NR$R=D{5yJYm={4glMXayEl3$-_-W<*fUvY!gqxZq7Zc8Ccs+aJ+m_19-z
z2wS^2O}EvR2~i<UKmI2s!|x!PI121qwZVNEUL{%Q2?e`4d}0Uj#`6B0?`^>(qM>>i
zZ&Y5Mg)YG(=(J9v$JJi9wFy1O9X!Ww`h2LUfYv}F&#jA~6nGO_|JP=u^N$LNtlaS4
zZ(wP43J;W?^n)A>06mY9;#L(Jg@?l5raqBa)&SQ<t%s~Wb*c!CqrB#hZpfy~Ome!Y
ztkZEubBO1EM^UzdJE7C6-^yg@d2u+aa+5H@lAVurHY}9#2e5a&Yssk#cev>uob=Y#
zYQvWSs~V=cc=x-#p7%j8LlRtn^y7sc>8Rc9lRo6wHzoPx*Hpm0DVu<5$GO!~LZ|aE
zYYK)Ys4&oF`L2S<F!U)plPjSw-UQkLxP+?~_!+$v(4;w8W{koxkbmBk)$|TYzw-2{
z{W0zS)7PrWXX<PM{>7CGOc_q2Y(r`BMMK(#olH%CP4umjSS!2p2>Iajo@X}~V9u{)
z$xLR7N&O}`cacZakNwu(X~$l3gPVh3E3S{!&Zgth$KYOP1BoJ?4A3h@F_N%h545Pd
zA{C!_F%eM|B9g73sh;wuW%D@bWS`QpuvJ6Ej_lb$_-6+t6bnPv%!UEB%V}BWH*ZbD
zuiKokZ?UasdDQIkr*m^cGM=30j_(dmQ}8hxA9=N0Iq?D)592|PuT=6%8`MG8dS!Ye
z5TPiUrbJ_53Aa1aQRDE)$z;IFlItr|=%k5$R1&LCdmiCESP$?qf`_k~#awiswb4;Z
z@`-NuE*+x?8eo=lqHmd9szZGs^`K~$V2AF(uo^T?ic{>W)rByOZyXFjhb0NCzhHeD
zNgRm#$45LTL#b!qs_(RV64{nl7`lhnM686WvBr#y73sxXqisz!=WthlvuW9otLOkA
z?=$M(F8}m1R59-_pI!B8N~L7VHh0E}o5wjL_Yo`h)P~6Qe3nO#COkCgd0JPFDxH1&
zagejOy~EC*wz;6I(oZ3`?Mi2NxLk&k&&^6zY3CCbvAlh^)e%?0t2Mm8(vGjvj;mN(
z`s^bv^IpF!HODK4o_EC3OPPV;%B=8>GoO>0mggHAaYBJH1O5yZe=QW$I7mAaNNaq=
z=+1EQz4WV*SN860N}x2kHzjZX%;e^oH2bP=@2Bi(jsCHpvt|?vEi-&`_b=ybU2XhM
zk>IoD0ufUs>&6E{*NbBZ+WXbnDm2qc;0krX=IQnk0Y;5CIr3_^7AfNB;Xx4wxJ2IK
zqwQ?xB!Ry1(`fX?CSTR4(0kjDS*O9rH2^FnP90&Cf?S_PtleaipF(}GAhZb`VIu;M
zHT%bVHn&ZwFDt!!h1dB}as9z)(*N5fOUS<NH?<A)ky(M6vtXKU%gON82oit2WVk~2
zRWe7#%<l*-+Rk7DivE5~LOUSrJTpA;d6Q#uptBxecE$xB{1qgk{j){t{IH8i#zYC{
z?+oFAV1D7<RR@`|8owj5E&E@DOdyVMf}pzOj)f7toO61&5Ths~45~xHeDZ!B%m3`G
zf6<3dple9ck|G2KSW1FABIJa=Ebr;KPm$2X6a9%y$%$ylLZMjoEAKPsc_SQ-sP>JM
zVRGQWpD1}W^5PG~tKe1G3zZqC0(~jmsSpP10m$j5xz9Iu?Ayq7TdB8i?-dvXpc$*&
zOo5u;KIuEukJ?i=IGcIt?<qxx|KQzXYfIW-m!BalspS3kWwOBDu)s&t_EmHCda@!L
zecUe-SNE8gvp<-(+#vR$c4EvArC<G}-4BIOc$IorP?07=PaGQ(E<b1xka<pV0ag!%
z2O_%(rKv2X2=jbGTP}9G>jx@S-GWappRZDE-xF;K{VXh|9ceqKd1dIJY}3|jG#$8>
z%4e*<#C%912=k#O`_ezd6_gd&1q<!PBi^P+#DKrm>HJ=!-@#5>AmYLc1Y=&~nx&9C
zo8a2-SP|m~i*wNQTxU_z*7*mEDB$GL<etPQJr2uR9E$5bM4u(YcFCPUDn$aV&GO#>
z-WIiX(7q`2d74O~N3H;OMb2a|`9K~K`%Q$wJ_P)1wzq4P4NKRC4^cqdcArjIe#yNh
z{7v%u<9j!SR1uM<<4VBxWJ<PfK}ME{+N3Q8peW-2d3g*$uS4O>2dX-MDq<1YsJMHt
zs@S1VH@i^e_ZeiWQaf(8ll;9A3#6tq6aAd8KLqN%Sj&xr56+9i#m9>9-%3to>V}_T
ziN~E%|3ZGVZv85B=24vUR<h8up*s|ET*dQ2+uEzo+-<JQ(LK7JGF97(4+vG&pd)#5
z&8nuG3N3e9jlRUuX-imx?trb;<tm}8V`Lz&WPjQ!%l!%%vF+2*?JoNIx7LpRu2?zd
z`C|p=(Oz@~y1}cOsgBrX0^cC;8cm{vE-+J_5dRXR`fDAz%I*iR`f&Y+!#y%Y6+2+2
z%hez`T>-A~&5gRPhkHi;BB?VhN3WYKIEUp#{pNs)*P`Rm^esR55S486cJ`#ZGm$Z(
zrZ+^R?BAgjX<b#HS#tD{mm6?iI&!L2uwA7SFFSkBX6TK6+*i&dfEAp!e{rQKMgH|;
zWK<~u_fJ|_6LZii$VO-u)Yw9_tt4PqbUafy>MHw1eC$+Lj&k>zqyH7%+5yMSKW;XT
znM(y(j;bcH3e~70z(-Xq8_ONWoYjsWm7)I({1eFz%saPvsNO5f^2<Vsl0*wp%y_vC
zBv)7*D@i-!M2m{B$u{Ln)vTLqO<#!k$4o7Hf`s{x9x^@g<STY~d(%ZJW_b1}f_}i(
zjbT}~eYWDG6uOf>#l11YU%@E6u|oFGeh;ia4^EDOrw4JlceLEy<Zv}a#*Fv+O+P&6
zyL(t_Qr{DE7?Z4bbtvf6c1=!(7Io=&L_Q_pW`<8wZD76!>ZOA9wD=e`@Q2^SvI|zf
zw>tYRrM^K_8CM_aC&*Jyh!TVWM^NDNwifs4zSH++4)b_WR9+%STX)8zY7O<Z+o56=
zW&)rcstl<AGYOmk27!~M&4G$HKfb?))@Nh*C(1quI+w`OtIWR}{O@@R!`L(lUt|Bc
zuVL)ytDvzu&NbXMH^x=DLo_d1Bgb~mK^NM7AVy60#S?@7{j7W|J7q(tXNlw?_3GLi
znZ)PFXBG`cJZ1$}RjVcfZf;ocOxRa!i!rDIIRS5a+nm;&YR3b#;IfsNEmUg6na4&U
zXxCQ>R)__rD(G95{x^c8mw{`b+vdl;MtfhMUjOQ0f$x;SZvduvsvv{B33f?F2wE$H
z8r(WRiUWp@jiEHy`<|9k*!u8$!A+_}1pz+AOs}BW_meewq5ubR-Yzb~Op}QSGWnJy
z&`xi@+}znL63NXBM|sx<PLNb|)<09p-r3q>YMxam$H=WaV%hiM2!4uxoHNrbo6eg`
zsa9OzJ27BX+1h$m6yd$Dur_~8*4S<bR3Wz1QAX-rtvR{hW#_{Wgw4L;!NN%9UmZOK
zeh;n|zTb6aH>Ih&Bh$+Fb}P~f*^EU_3_~_Y#JA2-w?_e{JKJp!AQFGA66NbiY7)VB
zxev}RFhaPt-8;m>erPX|2>82<J<@6);_1T>T~>-FG5sZ)hytzJyC!GkSYoG0IN$zA
z)hk0GsI8b|Ux?`_SS$Myk)83!hp!`<YuHmC56^NY;Ai?<_sC+_Uz{q!P}~0L)2hUA
zN#P?{hw{CL(0;wGk<T<wtrc|Yz{!UMMqSG|m~E^g%W38_<I<`2BB!yD(ryy~ca^3f
z{v<|q+G{{>S%s=p5qHiq%T+Kv<-k}LaF}yk==2(!YYCYM><@n#opzI0FtQ2m{t=nB
z2Z{@f5yfRFNxQnbMhv5l3;%PF{9++A{c}{Es}St{6-u*{-*#k)99-V76Dn+Ih(3=G
z^kSxobHVJw4jllH&^Ra(k_#j5l>dqU^^|92%4|2voOp490gQ<As<aA|VeUtIyH=Tk
zZ6(MU%^}e^x)<tAN#<Rg$A5cwSNPSHFtyl~aeiqtXW36Aoa2kj3a3Mh9VB%@UIukp
zUeJvS&sM8`EPiMmk!JR6$6M?rE^UIH<iqj=nPr9ifo7`WXG(d`l)?K|#0}jNwK>y2
zYJL2DXOX<wBN_D|fslZ%Q~Kxs|1vM+{}ctw<bbo}3)=69`)PNzcJh>ZSm6A}cL!(g
z%>8-2$_`YM^H5B8=bj{aFBMm5H6)vCC;UNs1Oc~V+NntwK{Nh3hJLXgX6y<wl~0r-
zrv2NUxn`f&{gP`YS9r6Zx(QNve>W(|c~y9DWw<^_#!r0OrPLEgMfM-)3CQ;!rF-*J
zLD&x<nX=O=e&sHy`)p6_x{7&2??rAQh0ZbG`fpW!rxD}U`X2N)hx%l$B7=|j3VDD?
z0vZ7wKe0N9Ha_H=Dn96WNgVy$y#{{*E29nzaw24XOjcXsDi}wwG{uwfTv$8t>WIAD
zrB^LzP*D9x<<<R$h8m|H#%Z-xW7aQ-(O*6t-}zz4h_WDF<o8LJAbxcNHO~A|C#u-~
zyu>zv>C@D<Nmt<`;FNcL$8L{j0Iqia`ChXL;+3uAvEKGie;dnAjvdkJ*mKKczC3EZ
zIOQr?!H@|;yFQGQBji~V91Mz;EeNspPkdUz^%4^o_m~L}Zc69wC5joMB*T%O7V1z4
z!qrqsL=NN&!aD5$ssaI$;`VPsiAKvK0`&en-;VCq+wH1-^#5MY3ydDx;?xl?aLY0O
zY)=8%3UgOV19?Oox#@S};d9lOLi05)h#}$7nS89JI(`@tbE411?i<H_%bgRE??E@5
zdzA2OF2}08W-5dVQiSu?j<vF0{&`1S_CWAoKhVR{`ntJsRnw|>k(8St3!lTHiUpY)
znkD;2<sfy$=R|q_9FZ#{*N+RX$kJ9*1XXflgxP`$A^H!J{BLU=C>J3oq-a|^1tNvw
z@pliN82ef%tKhPzYd?m|R~)x^#IW;!L>sQU+<DWZ-?uCkK^<X%j|O)<`M%6Pvvpj{
ze5hNpm1hD&gKz%wwweEMaQ__w?)y!SGt9oJpOI9>$Mx4c>=Ifrf3?M>Pb3sy#+>?w
zC=<?fVVQeu32-x@%D?nEV(M|PoYu03j8fN>K<^MpS}Y##mF&(HJp22-^XO-fln!Y6
zG~)d!Lq7dQ%yfy4<}!WDG4n(es9l-xWzjLI>h^rrGfZb^K!FZ1`Vmwh0Cy}dy21PC
zPAJBe%3ezQXC|BRkV9LXU&}IVNkzV|FY8K-)cgd&0}(59A8z`K&Z0l`!N#d*1B-_~
zS7zPPY_FKd!2$`u?SzCAY?FN4+&aaP@V!G(RcSO$WUM;L4!M()5+IuOt7uRS9eEQF
ziVcU$6&;%VpLF6bKF@E6Tt`?{#9m)@^YOuRP;~_u0RFhiCOB}=r#F}|sFEx2up?}T
zYC&L4kt6l;@G+auVRGFy?>UZE%a}Q%Vq@Ex@EkPt*DZou)a8HOOMHb;-YK-?B^J_T
zPsJymy><D1e?b7Wvk&`XZj#F<i}>&GzK30ho#&ex{C*txkX>EMN*zJNH<tYjmqyt%
z>)vLk{);_hUT;UjmnMu6$+MyD0fyg;w(7a?wzTem<4vY+L)aKi${d1mr?6ig1J+a{
zjB)uMvNp}{%gc60gQo4H`l+AO@A3i}zaJoJqM*xL!2l`Zm6!gm3bQGDyLnOt0~!P+
zm~%Z(^0_`qw}6`OK(VKSyy*ehNP$Of@tK*<SP=WyyfzZ({V52nMwU=eg3@n8QAQr0
zwEHPVJEKPz)es8IyL`y`4E6jm%b;zSTLsUzZx_Yk&fM9MX%E~FvJW&L2a-?gh|Ul(
zS>i)?8@@8pUk+p7UE45j@Q%L}Wtf1yV(MMaF`)VzxNy*ngUCPnPVoEg3M+d^sxg5e
z?a!Fs&m(_4wG|f{qnh0<xij$ysh(<(>oi#^z7j4*C+^g>dgW%`*i9k}|76w@=OAea
z-bPmTFi#UQrd}H>cd^oDtNobpyj1V)t*Nr+2L8UMyaa9NVuNvCKcesLR?}YSb^=}>
z^c3FOFWjsfyz%_OwP5-T{&2waS^t0U|H+)(ebElkBp0H~7+~l`GA2=muIii;4%Gx0
z%}m!WAix3QG>N8sx?RaBm6oyIP$0V+h$md!d!f+LCti_XT13hi^m5Df5O}15K0cKM
z2*P=A7KCrA^*#N;#PMC(dC!b(n4~jHARnQE5bw85RrS{ASdeWmYF^@HM4(ZoqiR^!
zCj$Cc4--OkT+JT-b8{k+7S(2cUKP1<gHM)LkchJ?(89eOb3j~^;~+FJt7?Q=OT^>H
zNjS4dUqM2~$#j*?qxAk|YSHb2DerW@arOSHF<H^}Krv9L4#tD7%$&(WR7S=FL@Y;2
zGSPO_<>Fe!{Hk5`#?%-ds_un}_I@3otMC1xf;8%6%GT&OB~X#JPN-+1Epgt<IRb2*
zQE4PEH@;%?$EK#q_&Z|CN@G!t{tWuUz2RE115_2;n#T8($J(@*+;lfM?;&f0ELf40
zYc7Wcbc{pQDa`%v#OLq>E^RqT@X)0zDAfdV)$yzTE`$P7IH6&PPwrv}>FgeHMZ8ep
zn-h27@BI}4`aO=R-`YF-iUhuPFz}`;2l<qLedeT!Cg9_ln%#haEYis8Np(5ZS8udT
z)#lx{o7~Ml8QVm`_dS&ZHnhU)okhNY4T=v^!p{oEkp-r!+Zl2CTo;VjbO!(za#`P#
zX?##VdcX&CK1>scMEs$dQ?15_GU~vri+@R8LYaEBg=7#;`dAe-c+!Va^UXW_j`Yil
zCWLQtgwjdmt#Z@~TK^8R0UvIC!^iDgx<zRYp*~PJo+wU*1I2<KJdU^3KM&q32R7F@
zWNSG$T?z;Xe}CNc`poIWw|${o<-rx`y;~BU<p;;?^f&+h0y5c@3MyWw9o-vL%fg14
zsG7CQ1aG_aI!hAy?qj^yC|<%F@&r#KR&%iONJjvT1^rXt5;58?cvi5Gwoa-~Y!jho
zOX58%nt-KVz1WNC6c1u6?2R`++BB>3P3M?P<0SVDDkX2m3SOBY&a7?daxy@8MI&Fu
z(+bq^rtAK4crrwW^hl0S`yG)kfco0ml)LW!fCij=4$R<yZ`|YQPia6AKiCPsk-2Qu
z%xsfih9mUaaqbkjM;q7C?C<B+`j0koZwx1LVAC}0n$ERJ0qdt4r@U;5|0qRr7UDu`
zo_U-!xZO9<zk&aDGI4Z<JlaQ8Tf!66p))n6`#;|M(a6RyDb%@Om*?=IX#4cz*hY#V
zqKIWv0(nA94n&%%1LHh6<GIVwG#`E1j)cSco!nANk-U{hHd}O)prU83jen)V-q$g7
zX0~%<L0039m;DpZBa=H*!7}>FSXC!(=3IA4EaihcY0Ng^CCv(?b){;W?t=b(mTvgJ
zV@KH}CDimp1EHGBP=mzR+-IGB@x;}=qFY5l@DDwqIIGjQlRIU$b@j`sftq8V3@G(a
zhP!)1=vN#Hv}nD5ui1ZXC+B=8mY#%@Ykt9XmtF^I)4RIxW*U^<qV05oOK86!!i9BB
zR?GOa5I8r~)Lh?TDo>-v2Nmhry`YB>irK^7k@YS_bq*NB@aXqHaWhROz6@`em}~>G
z#5bX|W)9sLf#OL;c9Iy%m*Dcyo?XruMSuDR@AUQt%gR(>86q~GSo<lfY6JTfqBcVP
zujL&eFBH}3Q&#N@FiwF5kB1!^Ja0Q>!%}oZ&i5+cjH`PxUAQFLGSl8!`~Iu^D@jcq
zlTftfpYC%*ACILQdlb+`{rB1arG1^iq9`A}6KfyCCovUpJy1e_aloD*XR#qoFEv7T
zORR_jv~>L<7Md0R39GxmdQ(mI9>&W|YbA)4xv<Yq!!&*S^RFlGwuBY9Vd<NTC*m?Q
z^<+qay7co|(|&P}Bdg~x&O;7~XxGOi2!Jb%V0Avy9HiKdG{3p=2DemFcZEhfnU(5o
zoc&a1M4xE&1^EH&l|7LXZeY;E$xSar!N5n?0mMB`Lq=zxX7Av`(e9K50A^r<{|*F6
z(rU++#w=K82Vvm=a%>HXVTIW)tMt;TfHh5ZcKwqWTy7u_$oZd9`ukyKe7Vep_iWC*
zQdCf+l$e9YYIAXY;?A}Emg+3v6XwZustTbeQtXZFAeWlgk78OlpdE1|0nvM!5i2_9
z?-n<X6&;VbFr(k#SUt{76ir>0-c|HQdZJXx?==W_-Sta-AunxGB)8MZX93ZPYUi>4
z?1Opn@d`^PQPkQF=t(#)2g2P+J1*{m88;o2P@l4stH!^;2IidaRQ~aY4KQ~1gSIo<
z?R`JORKe0*fPv;{_~IQ-n%Tj5!GANJRqto;HcXEgryt{op+uJRZPA7E@wo3R6FbaO
z_UR;-rGa{u*h6dCs`vwa=aWw1N-txx_P)(Rx6wX%1gg>1v5rDc-_7riz!#@BGzh$s
z7he(m2WLd&Z{r)Bz2swG3S5(MwU91HocaSri<8)^4NVyXIL{A;s0#2HN@Yo(JN?to
z;;aVyhYLrTrbXukm9iua5<t>vcRRULiVw|s>1qG_RSYpm>Y4K7eZRY30OunKrdgOm
z_!~6A!}R-QG3HT(-iu7T^<wk~7*kl0{UKvew2~e^Faz7aLh4`dPZe)T`GclxlCyt|
zZ(3981y<~I*Zt!F=V+HeS4;qVRWeO@#ABX{7ScqFNqG@r#y|jyGGSv|wun}md}~!v
z)!)mcE6(^e#^|Lv)O0QNTQ2UDX+U31P`BP7nr5N*l<@icDbL=pg6pFy1lCoWrRuiT
zh(%>4XhXtTR?sjPkVBS06>@~?J-GRNChBh(R($n(wUs;o7>*$U$lQ509`tojMCsbU
zT&zUXCPwCMDd?uNZV=!sPj}&swi&0hVWSXuWd?p~b9Uu@dh+#7c&=U)qeU%{F=ZH0
zRCJd84T_Sti)6~c1^%)=A5Tyg>nq<MwLE;Dc=0`>M$If67|`-yt;K%`ioHe!YX9LH
z`{jc7;q%O~b#|0+AK}ebOA*3pB#KfQ05yg|iZ+frL&_<D-h={|EWy|PvEkLnwzYA<
z%^8#ia?$LN4_?Qk2}NihVf466KJr5>fQ)rEF^r8)P<3x8D96GFX*pG<?c0Iuv-~rt
zKZSE*L7a4}GC%C<<bvgEV{7y;jzk*rcc?({)>$taJ`dFi|8J%A892r7aLA9R3D-pl
zPi>MhmQvbR5^)lHY5;iA_R$Yg;I5hGJHR0-jJ*556Q7`Vs8|Expo!3~NefQG#>{I#
zWlFWtE8c~FO6+Rv1^>JC1pl*5JaAH=%1DCYA9Xy5d^a15YA|tyuGFF$!sId?#7Qc}
znz7Nl+X?q(s=W4U4xH1QUk$z>_87l(o7b-Wd*h8gxx>-zBPRPzr!e8TF{=0>SbAkc
zec(bj6Ml!{Qu_;YW7i?{Da_V>-DUm!wYi@X=A~%=8MZKmJ)2kitKd27a;}xf^Ubeb
zD{%`Ey3ng|$t>PG8CLms%Q{<mbN7s#MM=dUba5a#DTPe8Ec;=0ky;V9Vh3=*SvwRF
zLkna#_QW)SaS0mwzR3Ogs)*=RSDKX<$XlBSo~h6o5z;0(TrDUfBWBNf!3=2mKB1#)
z!bO`#^w=6pA;JXM<PSQKBL~TzzSwFv^XLZq<Hs>31TyG?Y-PtGP?Okno5?Thdu=8<
z-S{~8ClBACNh2-q72}Cl-TU@y_~aS4!I}Y~fA4Fx9IZJ2;1~#3b2=h3^o+8(S{?8@
z-wp(FABn$lI6z_b7)^yQ5x&|3i`Fu<c^Skftg*Ic&w|DRKn`BsAF6l0c3^Tb?4r0-
zuS8Qv;lEY6Fvael4LsIr#RIDwpOjQX`hA1cLHkO)_#tl)FTNKZ1l{F@n?#Q%Tze{9
z`(3FAp&h%#U@}`7!v26N^x`MtRyp#Q1LoDxY|L0H-6+Eu8~iWlnhqUMO$Y!InEPhL
z$}C(f+gsk-*3{=*7u}K&4JIf)VMt4@q2YmDI*9RJU0G#I0N+^u=rLUNqf?;!#Rbk$
z-b-xrN2!em43wS+O?~w!yx_|cu>acYw|}F%X2`=^c*m!3Z$ikOx6hmX!E6GMxy6=D
zfN|LgyE`g!FC`Kx@LtVCwW)e$JYzrw33d`cch(a#kOoO`^r<60<wIWK1Y15ydY64m
zcu{Z!t?@XnTHd_qkIKuQx_@n4#;At=xG?CB0@K5k`zN~Q0120=?#+9jqRj;Zp7Ww5
z+iau7BLmRUb3YE2_BNKr%b}0xM3cU&&x^N{AA(F)x!1eZ<+5qD4q+HIPakE7=m9Kh
zF5Uo>BXU0p8C88ML}-1L*EYZe1E=?a^Eo-3Ofa76{U&Pjw&c~4oE`0uZ9Cg-#ZGYM
z)F(1<4@VW>!P;fQsvgL!8OY16_?sN$!WLv^(X>VK8Y_}Cs0`h9D!*&Flem!XNNtp`
zVJDrU*WG5z9=<hxxyR@{OWI%4Bw~G_@AOFci}zXYU_A*yG90Agk3gr%LYh#77m6}w
zu`2;|=!p;C40LR8N0?);U+mo^Z<-^(%~67HfEyTvt1Kv++O{7)iza=5z6c5tJ}5xr
zt8lkQh4k|&knN!NA-}mfp&iE4)Gt<82FxYGr$K7wcj9x3nec{PM-gsa5i}+k2`O2Z
z3Bb#tq3?;z(nJ`QLM7mCBtm&%bNY2PFi%w|g)Y)lnG<K{cnm|OVkZZ$kx}50n;19L
zS1*M8YbTFT|L}s2dK`&lE=mH4sz9b=8mx!wURQuY2jce*u^pma0|e5_9d#%oU5K!B
z2t~b12{f7b#4+%in}x6SOK-7rYY{(lEJ$Oh4-EVKL_hdINwmnZRM9T>-(n>xh@-be
zXT5)<-{zPEV-=eJ@G{mYOA|I0UQ7+jV{kVTC8@K!dJO;VV^K1Wi;<yYDS{|tH8<K@
zjGqN$p-lLuLAp@A`LnY$?L4W7pZ4RaCR4zl$S2F`FmLkKhoYrQcSzvxj->OIo9$e<
z&;}mR4=p-y(y1qi_!cA$q7VpRXU9g|h=xa-5JBPfjN6p@`i%u|d+et)CEGHc&}r-~
z-imTGO;J~=xBkSNO|1aw6(eq8G%1IZ5QAY`AB>*+c|TLujHShUM-%`LC8so*-y3^E
zi>&N~Z&a8q4#8c>*lHkR7;uT6yfhr8$y;o~Qh6G2su?o+4wbxyUQ*#?ZF_KzrvLy;
zY50fVBSM(xf>`XGiQX_^f1RKDS{d8z+!~2;YGJsSRDcr=e0%pBr8^*($oRfLj)Qe4
zB*kwS^U#??!r@0TRm4Gc==BYhq`|IwyNlDKM>ZfUFTH$)?%Utgham1!dkZ$t6ds4w
zf8U60S0Spi6Vx4`a5pm=@oDdT-{a5bO+Mktzh}Mq7$!i)<@<6&)dSiO7E?(x<742J
zRiRJcarl)7WAMetW)BgR3j_x~O7lUis|<%^K3nm1x4vr!Zrzh+P1V>#Uu~xp#xjNk
zi6~sBqXs)EG7e!cehy6$)EL57U;k=S)MgO5aB=}6>d{XePdN#C9+YpTQ#Ut$9=oQM
z@W3uOp7;hqn?Hr(1}%_(yl6#RF^#n`&ueSo^6U@MvlqUu_U4slPvMihLabh^>@;E0
zpdmj<h^``e>)jlEOV_-rUy_+7g=Uxlj-f#v$<50_aAu+i>v1l#YS`9<@NmLP7e&q+
z#S)FYVA*JT6!lt*GFF(tk&pU#eMyh`b%-WtHE&bl#TG39p?P((R6jl`XiQKvriK#`
z4F{OP9|ja%@uB9qnnjk?;YMOHDC+O2*Unngx>IcUBR4J;-<^U57010p4zztxg^c{6
z8>k>LM5&%qRqXDw{@ah;0cQ;+=*=F^Lf)vpkK`^xFl^$8YRs-rxcf%=NLKWnu00p8
zKB(Le@-gJCe&&2x7bvtQd(@mCZZE4z11EziLg~ksRWbm0pV}_WK~(=v93bKwfXkla
z8h>mIjmnd+CC>jZnJ%OON%V*iI<`*}j_es<wc^3Z8J}3yVQ%&uk+ZoCb)b~w+&d-x
zFDbIyA8&@(B4y6-pc+^!XjS3Xds(Qzns-jC;j#hC2D(2HQOOvsx&qU~$Y?JQ9tuk#
zQr|HJN^e5W@+0(Y3gx`zOLtb4*Jjl1q&Ams&{&w0+7nr;!^%DNx=pj3?2F$dBoO<d
zSC%}KOEqTP1^GlqB-@`BGwmB5MGI8#t1+#SJ&D?Z46W!{Z=PbyG96wz$ETcw`h{Ag
zTo$;=*RcbHJ8R-{cQ##~H=#sWh*$UUy14P2O`lg26|e4^kZd1;xBvP<NnEvn1@PXA
zfdNaE1l(UR@Zrtw+?|A9Q2G<Z+GXfgB>ckx%Dzf4@<t5(Leorm>GLPRP^?4Jrk751
zgn%E)HW|F0ejEAl=I>rt#o0PJPiP1yVcWBc-(F+A-1CbGkQ!m!w649o2|8?+{ibd>
zL-mJFPpqEfi<>~Rvur~A(#6P4w&U#TOsUg%BV*?QJ^@;lOocD>cJ>N1VTa~?KViX|
zM^of3jwN#u!bc=Z^@1yO`7~8h^2GsX%bu<0Z_rvVw7otViBK|*)6|__hmhM72x}$K
z<qHHKq0F=R5mn4|8Ak;?l~3^=+W_&g#!C@@Fx4Ao_nzngBhha)Z~d6ouKcXl+&OYj
zyNfUM0?SS^ibLGGWuV{qjARyLJQ+wVOgbKsuggt$rwPh~KG7o==lNd1mM2jHEia=H
zGik^>5mXh+CxUx;M%ev)H7|APv*v@+w4P2JsKZ38&^QkqY%Ml;Ob@(AQuzh_k4{WU
z29Dm*p=4a5sV@v)vsGQ|nm?^?R00{5BYx>{+6S^Xv|2$hsmO{2m+DvR90NVSd{w|L
zh5>G;3E(C)oA@|S{#6Qh_E^0Jq|1bMO=S}z6y{s01(IW#+}u!N><ssgScXk??Dr#f
ze_PJ&5!ArC0#JB0XwnE#eF@FC*Fkj=b#99;)#*|R9Q~?AAdAs=cl{j#<~*92XS>c^
zk#ZFbrL)7trjx#q3@bZH1^oP0uFz!sKNZxkI1;al?Fh&Z?Sp7i5)2bCk!W9&qev^3
z7AG#FuOW2yGv?M|=6$=`%2d%~TcD|=qLI2IL>sKtWg<s^*XfX<KjQ_$%lWbOxo{l{
z@lKdLJA){13cnB{a3E0)XfeESpFod;NY44C;cGIq?VMl*I`1KD9C${2)>h$EW@2~}
z9QGx*Ea#^_xUH&131?DtD7nYRWv$A!ejdX0x|~cEuzJGfS^0g;rF9$gc|d<TGDDOL
zuQ}EGkd?wgIu(b=RZxZ0!H;)`1cC9N)X4d}0)i6H){K%lzaJWO_*g~VT&uy5@nnwv
zvi}l70X1?smvNo<VYpQB&n|tQFmWmyiV9n4HcKVocegt;Wiu>5g9*?_{^#@^YI$ez
z8B2c-Fw^n8iE#Qjyx@z_hywo&-Ng5YjnV_srD0YIjHAay8yh@0tmL)zz-W90sW(~C
z(LG$;u1b#qf>c?!co3S-G79mf@K$_n&1J`<{d2wp{A=yO@wJ+Zx{|?vx3%KQN9o|_
zM-*rm^$k6&lO&xvC$b=k;^s*rbZaE10dV_bWQ@Nk6LDcr;AOe=DroBSjzjfNObex#
zPwe-Zppdui!jO6u)O?mO9Sd1#fIcL>%$?o2nx3|A+o2*>Zyx5uPZ9Ge07%CG$Bs<L
z;f-_m%O9-?j}%+|fcKLXZRNtDvHIh?Bl&Rnbp*vPdcMep=mA=6H?!o2rThPyCg2pQ
zY;1G&kr$Tmb9#%~Y>Dc6vGA^Z^v>1u@kA7#tm(%QP)eWlghHrjN$0nbgC1&Ns7R#k
zvr9ww0Vt$P3S?*0R1m|LlBkP?4tLfL1z@Bsj8Uq#psZV93i1>uY4w<ogUA&M@H6E?
z;NSxd;K&?NL~Uwn-7jW*giz)>cex{$H)sTS40<rrd5BWWgf<ac(O>+IBftKNJEiwQ
z{nbRLnF1gs0taG?kqC$CiC`9gOHMa47{ST-$_|edz%I9w<IP0E_;<jq*$5Lm)ehiN
z)1bBKL+OKChxF<hv^OyVCTnjY0|Of{3)1rK4X?T&G)1%wakf{O5a@}@1b2|tBjSuZ
z_n%cq4xiFp7aKN6+{I+|LuouhkRuyH+=itATfNgI`h9oDtnB;d*_n6d-@v1|QO5*u
zhkd_?HeqwAmcDLhUe{g52?{&mBCvKG>PzFH^bkJq-Fiab64asKZ{9SBa@N(2Iqdji
z@Fp+V`QCz;%@a%3MR(+jXv0y#d}h1H>0GBmXf7&nFJm{Nhwt;F6BQuK`h^$`$Y%h|
z@5oU;qv<?FT-Fpx+j&6a1mS&J4wfuHv;m_jL%hF1(VvA0U($A;BV6H3aad~Sv0+?X
zx+zfKxbPB1egI;?rhoq^&a|d_u5)jr9Kc2?Glg1<lk~pGrp5t{dmp$(=AWY$B!hP6
z9}qd!@<!R{SV+^05s1E$`kb4}ERdOZ1X0qV51z=+80uwxU(A>3*ATE%xd`hlG=AC!
zF%^ctnmDd75hDPm|J}*kmiVybb&_wDlo&nzAtT)y7WIW2HR)i1zI`GYF|z}ja*i)r
zkn}srcwk9(`&P1$vxWG(&g$av;ta>Tn8~Cdf<w#of3N=<?8!UQ=aNdnGwIX=jlY-J
zJ}g%`gNP?y8!N)$1zAlu2VR)|7Q1;?Bn9o73(gM*7RrY>{kN?4$=tju*R5QD8}$lA
zJVpay1{VoeLYsVABTE;wAe(AVp2Y0>JPlBHAl~wD=OM}tnCByvPw+ypyb;r=-{i(b
z*yiG%eTfqoO?p7XBboTXP89(1)<|+#;h7EXHkR(?0hLZNPX%7;A08~SItjLOZK>Cx
z1^&Jv*~*#F-dUPxH6|e>ga!0R|LdwHwMF#=bJ3)4DFAlg+d{a*)cgPl3wWpZj(lL`
z+MF;UdOjI&dC$@*OJV@be7;edEz;O!CN;!z4eeS<f`qD2LF31vS`8=xKKCO?dhT+i
zg-2pKMVkePku1KUX1DBK1~h`@fp8@3to9;s4LG<JSDrTS!3b%hj8D4S_P)B`#>gK0
za^)&HcAw$NorDVShC+%q8o=6$XJxz31<n1GDm=3(;Ii}Y#=-0{{3!(98|)w->}vzp
z_cH_2KrgsPE>jkq9H7|lcHmzO>8mG;eXev(kBE6?$KHP8%2B;o?#UhC0|XM>IUo)f
zzL^!!fVKdAD6S68NPFGON>_)N)h}OpnL+_qFF}Cm9(J<SJwP<f<vi7`BuY4dL~#%M
zf`;4`?ib4+9=8G}DxQcBtJrHJziDvqiv7;}-d^Iy<QHY2I(aEOv}|Nbas>4dSo>1Y
zLPwBqh0R5fW%7Of=hO6J`Z$(g2|YlUPfuhX@$g{LCkxT<AF4(qpp_FV%v@%Uzadha
zagPbGMPVP&c>)Zjg(JK0)knJP^^VR=d>#a56{U~SIaUaw2L;IR@*jOJG+cWB1SBQ7
z34dB}w4#z7>p_~dL##?WNF4MA(?2+ORQbo*^|d_Px}YZ$?D~g?q46(U|BlCl`We^~
zoqkE%RX^Ou{X=(A^z_{z^qCM5{c2HH9-SRCg++$i_}4$9dk-7_&zn+BBkAgTU?wyu
zH|Y^a;>&>}4U0WmKgM@#nCX@!vcw1UI!Ofx<&)Ip6oVUa%27)kD00Z7*c~pA85ICt
zu?GpJI{-#i_h!r04KFZNEV^_xR+wmaoSrc(yd7?|=n}E*lCZlxOYv@92Qd=~wB?f;
zq(B_K^{uhteHkg`@5mp6iqQd`!T5U|BxARM_|sf|146~Qd}sG2a^?Xu_R(Ze&}FV)
zVVF4#LmxT`LwHX?B)<|EFwPebelnNJKC_^SPfH@A{3yjasikgV$cvBUBSQKa07+RP
zB6u6lg}s$4cr;YfC7tabDb5B<pPMB;wPCrC0FSoHnzwG7w{$Xqx)L3u$a)wZc?(T>
zYNSD`+<Re_PZn!1n=M<@Gvq0bMxwi00y)Y%7u1ePfzOsX%Sjh;#{T_fj}4PX(byfm
zvDKDaGji%wZP9IQ$E`r=O(Lhn4$B4V=A5=55~%>1!g{pEk5Ti_ANdb1&ONcY{&%#q
zvuNSW-_6;Mq>;>H*J9%FOzlN8J4=qwddRaf`gaku5DEP%OBBc>TS&m^u7j4cE#P07
zcHE-Q%_>)^FjgUyFXY&Qm>0)3acj#TISxilFc}!EFEA00&>BlxfX0;{KeV$c;WpIZ
z1!P|S<W85Lz;VTt<ZWkeXH$akGa^+Aa|_2OW8UF7rk1l)|FGb^K1Iq|mCL?M>2lsw
zlbZt37@LmGA}V=PQ92nbE@^%b&rqk^$tI)ZE7RnhPw@KC;cCv<%L+SddCJ1|SoB_Z
z=g*(i^W^F_0dxOelcTqyK4SuKA~&OM9u@!ahWYP1RvFqE$vtDWE*GNx1oRwnRw^HD
z-#lBX$Aljl>)qb2ceW`=Tt~W%T(As3cj6eT&kQ`o!?|cxHNFq?CWLeh?_5{F`5Nb#
zTokFE3#Ki1KI!p%>6?3X<oZ6f%U32LYBj*Su1!wHkFM?r-D?B0ELA<22EGuYTkEzm
z^>A@lfnl-l)v^%C)Y#8LSK9-6o&^GvQT*AI%Iu|ZlaqxZ5WQ!7w?}|++Y}aER)5UN
z02#xHqpdvz@^zYBWgp7)(c5y5Cey!<j$k(*@c>AQHI;DjO?lW{5wkXGAH5LdNP(c%
z4X9nn^?mGR$TIaNqS<Hpyly=BfHf*c;kSJsO+1m;TW{>S*(%{A9hSYu%ebZjwo|H$
z;BiF>J&=NIXn>C$Ft?xBe0WS((jY#c2Z`4r0vA+wdGW^DOp*D^MLCu@7g5G@+q&N>
zw~&`6JyXHWfP`u>+st`h+pVJPwrg7}b9S=wHkJy$)L`6A|G6@jD?>r{-a%Z&?QZp5
z!t=SoT6+sk=VM%L-*ghC*SzW_li6uk6Yzj0Q~p8wRh8ZNN;b`wglAe*cK=5z(FRxg
zG>QZ`b^S)JU-9qaBYpWmA9#zvXtVo(iK1Z`#^iq*-u3yTr5o8swCkAz=PUswC|3&Y
zid(Z!-;yJVj8QmW1pL`X0rLBwB&gTPpB0(V>@=IwFw3_&hj%&dNmq$K1}9y1b-F9M
zJ&N6iJZ?hbPv0iA2)&=GUWK2{c=p<*H<~7KikBM#MBxw>ElOwuS_HSbFu1s52kUn0
z20cH7S%0A5dg5Sdme^)LycBg%VO#zFreG2y+<k5G{>_Uq%%Bz0fS^x~xjZ?`0<^h>
zLHa=>s5^){#X+jKw{mX<EpH{v78uI8k74q!TcuuJ1Su^_upYt+1qk(hE%g4pkDlI%
zllD{v;(+nQ`FC2`5{H`a4>((%p-&yYBtr7xbFEA$fg+nB_284c(#O|9h2H-DT<qjn
zk%EoX(I85ReBZO5O?`a^oJ_=E+GmI6S;E)JZ633w=Zto%G1;I2_uXaSAHHXbxL<bP
zUKF5O{z%%_g#Wk<!PSOyalhuIt}9+Lq^6qg-sQlzzJ>KPLT2Bmb9By(#-PDmsZlhw
zAOQx_AHk``bS7G>-u>B<eE@FE3@)XHHN~3F=Z^tfAeIEOLqIB;__2_-CU>;HjAyLE
zD3n;hyoW&<E-u>O_R*WidT(w6Cz6HN-{1aBSI(bP!hRRvAjo0+I&aF6f@Du4atOaB
zP5|d(93ZxianpZMxj4kH%qXZff}fES6muEYz%XrW-PsiU%==jc8qmDSdjYe+lz9Na
zTUs5X$Ecv!fC1(|Fxo!-t;|wGz~6^R`in&R0>{pX!&*3>6#kcdZor@NVMOe|Jrw2s
z*V_`RI?b5Pv}ZtzGlLuZ`t0k0>Cg~d`7n&bNIX|YhlF$vzQPCbC9w;Z&qJK8`iTYX
zT{?*I3i~fB<!hl;3u)@$BWl5UzXMg-Pqc)Xr;GP7Pgm_@7UDCoAjrRBjkQM1ao!SC
zQ8J_~&0OTU$>kDoBWnq-Y*{Zp@XH%V-+Dm;QsK<+6M?bMFx?<c(sihzY|l*$^!S4@
z!wKR{(cK+;+-kpn!~1)&eO#-=cWd1jvqWg8D`K0Yi4H{|!nIeFVD;23xUD7r!XoH!
z)`;)jnErO*6T#S#>9-q7f10vJWMgfQ?JjXIa?KwmxOED|y$nAWPfR5heH?r_?eP$i
zDLBk1L+NWl@(sL%KxR+eB@&sqs2NWbVqE=YV)gpPrpv>dKkO}e&-L^%f%j3|rUYsw
zZ8bwB@ua+0%PETVlZI#=A^I$pi@k;epu}3t@5r&bT=G_0LGm=kQUpLX5`eA0BY|bx
zBW0MWYvd(N02#WZ`C&(Zhi!qD_*npwHm+?CWX5_o7<yg8GUl7e#qDz7Nso^UUqbyf
zx&&-spdq9(zGOlR1c551t9j2Az%U?|bLf{(3MqrhIK{=0mrFIHr`W~xq?g$KS)0N{
z*X649NGhdjEqu2U84Cts0nO0)ZT|yiWrA?#mOQAm^8J~=9C(S8IoD6awBwG`0hGo9
zP)Ca`wcR+`&Fy<4z;XGMhk4o)D7EL638SI<!%Q{SC!Q%ezHo`RtHmVX<B&Lqn`=T&
z>{&58hqJT>u!q@T>NeL97^8X5t%?hDf_Dz)l!B=fJV5Z_0MWZx$$A+OAXaxt*{vf{
z6J4R!_P*rRHL<nyc$cg>!NTqI@tyRh?W%S>i@?>`zPzImNMJ6X-7~rnLucylE$e_O
zmMeOsPS_j3XRhff>kiM{>zi<i+;k`IJ@VE1=(}cUQvZF$nMr&PJ83Y*l%P^e04lb#
z85Kwg;8Z9J{`e&jLw|E`_MD$&6^|gZj~iHC;2FX<YtpIT8aTF<kNA_FH~&3^V#8<v
zO*>r{v(H+Jw??^dnG$}OE?)g%4|=kB9J3?eKeO?M=kv|=Lw0->F^v@M{Jj;3Bj6K4
zT6RR?yJ0mTq?&DI+;>c$DrhH8v8uZie)I-4KF%D*9%lZ~=_0&cl=eqKQfaN)1rOTY
ztPF4%m50uB{0veijOjpNhc4CfN`@~UR%d0v?Qpk*_eIl!zrnflY}O|&mCuFsK|<-s
zq3=AdW(E``u@d*zI}${+uv*hCRnWgo>Hu2yg(SM!qqhioOATq-nSJzOI{rEr>A6=F
z$Crr*W;@}UraPD0Rj`}>h1)%e^kzyg<LjAx{@t2UkCpM}Os%WpED6L{L7sv3L(tK%
z+5E3_c$RjR3i=INsv)ene4^1A#9b$5$@_y}U+ljmibnuzMF6aoG}OyZvP&@}sT4wG
z#vDTXzK==BnsR*XTC&=*bUIyZcb`w@cC+KppSO@2+Cx0W+JdA}Ym$On-97%_&)8Dk
zyRhl1G!O)GUZ?qzWkd`aqy5Y4^M(On3o(ql5Mbm*+WQ`-D)XXxiZ*(4k1mX$VjWF)
z{k9mjwBD&uww)pBqd1hHzN@Q^EP?py$3irSeb7*qxriqIUg+#};R8RsRCetk8Ba_$
zEtH9Ci8>OG=Oe&)4+35cGZu)TTS6a(RMemlS^YMnbeZOikJR4G$NUd*_%me=dHmZp
z+1AYP%QpwH=62l7J~FqEa#MS}n~nm%s(^M+Z%0sMo?1-Vl+%%pJr|eNtLqDK#uh`U
z>h6#1*w33SEq1_kBMIcXr)Y4-B%Vx8Yg&piG9T3p?$?g|rHzfXsB;OO9c0^D>U!~N
z^VhA`RTf~6y{Mzq&>O~D(Sf@@?>e)Tj{#o|Ellj|mgHoj!!$m9wh9Pq)nLTgNpV0C
zf_ZZ$$_{Bhwf%@pLoLYQk}QOm)gOK4F__e4O>1n|t9Nd-Vf9iIvdgkQXDJ7Iu6)IJ
zB(Z(gJj~_-OxIsLlk7XI;Hn_Nu&=LmG&8&>9VW%cs2MVgzS~=L!<}B^qrT1FQ(*QE
z2XGv%y~s&@`yp4rZDh8;Ny9g2(@W6Q_2MNHs_2RJz)s@k-NkoZ0NT<A`SI<at2N?5
zQO1R-gn(Q>@R~lWE|SAfi?Qo)QC`FG>#Dvx{o>?Jr9Ph}DO!sHJ+Iv4q7y$;IOMwE
z!mSQ{w8kP<FTDv}O3np0(9ih3;xdKZsh8Z76Vf)Bd<U!4@*zDesRB7JM|dvTkd4A3
z)60<p9!LMYIa?LJ#N2<46Bu*s>W-f+Q(<t8g&ujq`lD7ipR(i$!Vt6KN=~<sYA!k|
zop#<%y`U6*=U+q*M3!6YiN_bAY3m`ox~gB`ib?g$<UE_|4FizLAJP}TpMGDOwRvsO
zpD0n(r=ikyy|wBgqAvkP*LXa41`VzFK;l&p?9GI?OC&z&1-rKOXb!^Ifk&*DUEea>
zaF2p~89ua{i-Z$d=KwY>Yu)Cl%d_nzot<sHzZ81TN-2dt#goul0!%sw`5R6ib;#kk
zC-2Y%OmlxJz*l0O9l?0nP^%FAD!Wjx+FICz8h((zI(Zc(b>^@-x2>(fTA>BWnT=LL
z)#Hkhs)&gqftNl|TWr!>oA-`LGao>tK@0rfST7a>6cE(X=x(W%NAUisWixdQK%z`o
zn%ScDqG@vC@sp0T?7)U3z@Yr|5Jo<khiH3m3RuRz)8Y_rA8mxTJXe^`O6@Idk^231
z>+Hn&_ie`yNoQxh`#-9#I}qys|KFW+_8u8oi9|-(#2KMsW|hj$UQvX&vkTFXlucH4
zB4ykmqinLtsf4T}bU1gv*Hxd-_w)PP`@G+;{d_&2kI^AX6JQ3>1a4H&EqYiwJv~ey
zlb$E$7~gWOQ>VMkH=!GNAqBVUkNSavrAg%1YTlMF6&~Q$;S{Zwp^H61!00Y&fXu&q
zN=8Dsk|tDo(KB=Fe%1~+IC$5PjuJin#x2q|M8;~Tr<9xkrJ64VD0Rtw1=i~)hh9On
zf#G{?9!C0Q*a1i{Jl$z6M6~=?z@!9MJ1JIBVJD0iBofX6m5xD!vwN0vX3p--+NCEY
z;r(oVdSYA#9H#LJFbQ)gIQJ(bBeiNuAlI$YqiHx1LIFyGXKa@j!FZ`Bh5}**bJz02
zWx<Y#uR-M`&oK%Eh&eiZw5<2VFO<mD<~#kuTbECMcUqx7q-_fiDd%XG9th$j1mVc8
zg@h-8j=FnUW!FL>K&**=ZB0xOyUs&sXn0z+g<t<%u6(d5&<uihvUOm31o`URubzu7
z8~rqk!>*|<SAk^9$XtJl+O3gW(*hLc2cL7;11|`S>lS2=9vZN)c3SjZEAZX0fIXgU
z+^xC&%Jq1PkO~LZ07|gX64RE<DP$^vG*y5_iQa9^5bPF-jb;P_Y+zv2ZkEtr9gl5f
zRo=jRu1yQTQ8ZcrT&*<Zdgmlamv;(p?KU>^;hsEDhJ^|ecC>(8kI?&<w^xIyS1KY;
zI;H9Y1-@H3pdp~Z$;YR_!wise3J?5MqaoQ2?4-^5^{AY{&Q36PBB49_;vlXLx&`!2
z!)StkDrLnBK<+?sPl=#LBoDb)OAqaS!auF7);ilS+jHu>Rb#3sVM6SDj2M?ThiPI0
zOhuF{M^SwItOizX&iNJK#)2e`^fg-2`o>Vo?(IF4x8mKd&Z1K-vxw^Da1amB1BWV5
zdJ{}XlNcHqKzeR^MA#R;<AEKEYJNBj^4~!Y9!oK6H6Z?wdF`Vi_@$%Vo|U-Mg0yX<
zAE;fH^&>Zb?pj_TWVn94CQygXUcKILvA+jys?WEc9XG}&yWm}4S}YZ1Nm8RfJlwqp
zg6ZfOw7&rQjv@$ms{$6@-p}I)nJ-VcL9(qm)Z8xddDSFc;Ju3?eemJ}*vF{{^aFex
zUWI}=NIppQv&&6;tc3kI;4m1+bfs{Uud-9_`yIFrArAw>Ne-fsMBobRQupWCi%sAx
zkct{u@cpdr09&znU>#{o7pjQk*I44$Se+fwSgnx*w5GV+n@c{3R$@{F+1k!B4iwIK
z7OQTf187}t;IdmHW@(8<PVaQDeg)ro4&aoM&Vhp^pPu+EWQSOwX$_Gufu#H-C+^-$
zgPxU;fP<U>K=*gIAFV<q$>94R=10vNhqfG+jsB_3qv$Zq!2oo2vn<e~Xkqzn$PDK;
zBus7rbxvgj0D1L>zH_r5#|xdleeZmwO2WmS7C&)$=-jc7K%qMe=d0yDq<{vx%58x7
zDt%1#=K!(-<|nH5;)wKkDU<?T&)l*5(G2slnFZ<6ql6J<inc)i8thWNUqj#N7?W|j
z8txXLk@kjmDtsbj^IJg#FVIsjW=5U+&G)w`g*>RXQ-VZ9Mrhg5L&NU03L4N5YP#>(
zHgkrZtPtr6__F+jhO!X@qv6?fL+WvJmH{g>7GX*H!!j8Q{q%gEpLlX1sP`=x_u&mm
zyj{Xvk7_ZOl_eQOUcv;1Z>!fnvroFNh5$)a#T%ZH8N-+)5u&crkDS=oT9wgFeE41+
z6pg0L!LX)$8?fJuP`ecie2c0m31n~^V`t@?JOqFzPWD$f^%zI`>o`a!@&d1HE2hc2
z*7Ws;!O3ng6n<NJ&(sXU;{#zmHR}jrFa89*a~y661kN88Gm||=^oui6!rS~%N`_Cq
zwMu9S>Ph0%^(1rBj&QM-Ez-+@23;~^$+6<>N=FaYS6}({3mjakLpWf~ZgN4WT9G)0
zD^y}oem7A+NJfE*Y$~q*xOt&C@D+5vgdxchx5v~u2FP8O>p~Z?yE*65O5HK>ukC%|
zgph&R`{j4{ioyaX1vEmQZK)}}rrP^XsjWiQZl=MNeHLr2N%sRd!snY=P7y{n4=}}s
zgnjDXOoEF}pq*B=qkuP1T0_1Bw->ppX=pnfyA==9>L3z&AnzA`KvJk8P5=u1sn?ee
zKbe~?>{WQuJgMiFbm}YFrE^T`=@G66b`R+#^3GDHmC%?P(^*K-f8t|T&{nD0-&#r^
zqI+ldq6G;s_>rMF-bAafu}Y8Sp*4QPdt^RE552@#l)XLAr(z&5**ERwD3ScigxtuS
zvpT5B<Q@T*lPK1jc~v!Oup;?g(E-R5XqVeWt)5;@k3zk)s6FALi^PzRJ%6>!Lv5b5
z*V~GE{9{XJbW+(Kdv)oSgdRRw8zgH|N=9`QAgxfXt~&`(TGJA$2Mkc4QZpIkW)VXM
zTrdm&-24H~>)4{_)cKGJt`c-(yoHvCo}^Z(pq8rGfSXy4jjNWy^x?9iDDTOehr#9~
z=#F=Nvo}+}VTxDtZ8!2#J2aGHg#F-$>_t$wA0-?!vgw8qf#&h$$*uRR#UZ=IblT3@
zo3Hy{gv;kNNe)FevEjN0W|R9(kb5mI-;xi%<vitF47?fmqsT$CwY7|EY<66NGD>m%
zHw0<ILv=_DmZ5tSjwNwD&z7eEs2*hzgEar}Xq85XAcZd9Bqtt#aWXHVBAj9^wk)-K
zenyc{BS^l-q5Lx1K>e$^VS>1@=<^pRK&yPfY((pO=J=n_k=Bc_v8H*`W*)VzFYnsN
zjNg2D*d2J6m9nqQqO|cgLaj_*e6Fy<0C8cWV)vE0jJu<FlcyDIpGuY4fn}4kBTw?H
zs4r~a6Mr#iH5gEROd1mWGh%G`H(#?G+$7%jGY$h@q8Nwb**(V88*+pTZaeD$6UCEs
z`0b0IwB+{5gj<)k)C?e~T5}8^*aXL7$Nf&<#&iDo#OsCoXd8*T37XlN^p)R@5ki0F
zd*@>&w2J_?CF*H7?JON`l2RClfdiNQj>c#EH4QO+-64DDqg1Xiz&vHvlf=4dP(0}8
zfoFIo^cCHuqZvy84Sq_y0PG;y?knRXkz;#Dd~D3$vK9`(Pt;5ffMbkH8V9aW*Dnm(
zCJP4G&%A3>dsFYuh1Y01GLjF=S!36-F3|`)zy53e;zRD0U|hFa%=hn)*GgM|Tm`9@
zBfOG<t<p<yz*zubdmcu?Mpi&l_YoEdKp<xWR0+$Od)qpsD_X1XY^{RiU3xC!f62NY
z12<AL0n#JQOx1wx&?X}0D9Qywy#EPG*c~BiNMeyzWgejFqx~e8ZyvuCc3)grQ6D;V
z{31nv;PrPZHzvA^%Z#Rg*;%$1eA!4B$gll|06mqRwPStP9G5=k+y^(byoVsNg@2z|
z4jQ`Wb15Yf)p*-7=j=n7f!sEWG-Y4)42{rkt+SV;%gD#9{Ij(lNVdE+*K0U($s^e*
z4m#dFwkFt07e-!eKDBZ&L+nDJ?puEiu_!yf7NL`%mQOTrH<|FnX@o_@q%d&d-u(L1
zAL~A2eQ*V+h0%d>?M(=1;vj^?svfwZ9uL*>Cy}Kz$+E{~<RLeh!2bF8#O1HoDwsjJ
z_D9u?uQyt(zp+KC@#<?ma#A?T<qF&S@w=T|)Gu#QQ1hiRK6caJ4^`t`gHg+mSF`JL
zjlOI?F;~cgdd3tr3#c1wx5po}OsT)WPN`T?ccqq7N5?Ql0Jd}MtLvDST2D-R&rHH5
z;Z2pG<FQdgFLSqs_&_(eqNsxHpb`zu`JdzQX4HYVR_$VSh(MM*3dsBGXlaQt@Abu@
zrt9a$qBNLguGV|w!iWOd>!(4YtT$_K!TzWbao6!N+;jBsqA=z3rUKF<dy>xSj*tg(
zWLbW+%2htC=0jSSX@CmHnz8w{gKrpzC|Xhw+w{GSx5wJXB9x&YL(qotA&`8%2p1!*
zTLK(a=T(|(9NQxv0{zq&h9Cx=(eCOC+F9C~=j>rAgXpN|QCA9qPb)=W-J*m~O@O4S
zDFQIS@}Tgg{Mucf4j_@CK*po$+lsgPh*Uspe|^@S9gUg9$-Duph`JKD2BuT=8>`}w
z{-~^{8Dl8skT>hq?KX>hzp_~XDwacwBJh;)Rs@`Fd=!<;zI-B@s(w@gTgkPi9P%SO
zc93lYT?Cv^01FCpUcBH0MIW^QxTDIkMYJ!FF+F61QTgwk4hUhTrwG$>Dp0DuNn;%Y
z_(PVL8g}k}L}!-~?r_Wnn0$POuH+II&b*hWm7fXqSdH+IhdFcDYn)r}O~>RqfA}l|
zC7-&!M{Dbg*xbOAr#cDUX90;P)RG}RWp|e1leIE2m1B}k$?-{0l=buy0v})X;HTre
zUzVa85YUzWMk7UXghNM{#)f3Lzhmxz$F<A3_9>0mZ%AaE4i*qRecPqe-S)MuliIh#
zR=qWOpO^@kS4ziUU(S_A^hU7d+gEOpY)L2A-iIH!#^&@-F1YlJ!vP?NZF=T{J9>5l
z7z;`=S-#wg0ke<iHreir!h1VQY~{%0v6p!3tUcw@y6ppNiBOAE#oLEz!RCE45@|m3
z?qHJd16h8j8zC%XO(R?cZ5@GvlpiLgv=s#mgd!_Hik%+mY%5ANb$~^xaO7BXy1kai
zvWWxI1UId6mrl&Pw{YN)DMep6sG&_rZX;XrMVy0)%2_(VQ{BI-T?-29c(9`ZG!Zzg
zP~A3_0|;aOTZX_K)r~h=T8WQ_t!w)|GF8AWFpDozGojdP@+KVU_c1m%&)>`eWogvG
zEh8Q|dre?6Y);jl7KE>TR!K#g;KLn?*}qPZZBu3ba%*WwK*D<M7)=!L9+|=QzxEi(
zx+u9zK6-})g1m47%SOE#TG&hg_`8mqTSsEz3?x9N&O~9KK0DyBf*Le~?krGI`Iv`Q
zh|kli?Sr^JLqD@hKb8(#kOT#sLB~7@y6l2O*^BH!c%nQn6K)t*deWKrhM|=t%`Icw
z)_5RT=5(poovElcWAvFE^%18W7v?R)$ozJ4=2X>}gX&!R@H&vHqt8?)!#+HU;f-zv
z73ev$i!gT<kU+`#=vU=e5Qm?w#Yr88hnv--DqOP2yFW2GVf*)nw2O{{>0Bu#lr1D!
z`i<OHOBVTgkOswDeuCoNA#a(n{wGZVba$tI=t1^}$I2zq2j*XfA4T!MqC1OyhCWKq
z@jxeEUO3MX>sD&C1tgkqaY7+LzqP4R2mbVUwfQW7d%mJ0OgJlOrEsT3JW!2^vd}y;
z;7*d(SMZs;N21O08MD9N<{u3kK5tyAQo;+X0g@Vwz!H<U&HhZ@>|3tc$4Ew9^41dn
zK+VF5id&V=(X9X;@PksXuMgXQ7-6u_<7#n20ZO`z!1l-OyMBQbvApyS14xX>XgXbx
zbp^8!5PDxZa|L;PBXj)RMIp{9C#BpGKu<ICR4@bdQh3HUN&NblZ#B*{KtN<o`h!6m
z{OCnaYQB?Do7IRsUZ{&9M2d06yOy`=LfBQY1=&)UUbaZb;u1I84%$SlN(5V)+YxCw
zqm$?Scw@6z@;2%ta(^MKx>jT(Nbj$1i5i})`nXnl`<;6HHq8`kSJ}MBNe?=Y<3-nt
z=V9{ppI8^4!5*G8m8S_2Z!w!psvHxF^-w%fho6=Pw{T|Xp78<w#VHz8V6X3oN7o#7
zH=82&kDt*Cv)-uvmb-qJgDe~0zpXj&+^1{k$TRtx3)S%ycgeyOW#6wGkwlcg-hMVR
za<G%>+)~jXGogSv$1ML|?=>i?{0cd5D88+gB>1RNg#*|541JqV948gE8qp^QUDXN>
zJ2q7XoLzAj@vf6^OjI|LV_FPaQTa~{7!tAlh+&vZBHF)94uwHCs&=Q>HU@X6@80<Y
z`=n!>V2a7(X6V7PNASvd(DpnBjT<;c>%thtw%TFC=QOfUo`1P+v-ty@m(?75fC>cs
z0f46!9YFN^;MkCzwEd3!AdieiQX74j8Zq$S_#!~dycP?DRDl3->E#-S`&_#yhkc>Q
zK}U$=@gc~^YOLK4NMB~d&&-C<Cn!-4l8A^dZn&sFQubu`#roVc;=;_XurE?-R7Zy4
zpW5?E@CW@&e8d%hJV<3X<7%^$5L!ym^P=_&()KUB2OjDJ@;||{laU9A?^EXDr=Ezc
zb8@A(ZmTsFs@*VtU18hA5=A2$34BRaY4^U*foc@Jq}2*FsC38;RP4&?Cn=?$UY(*R
z)uvgQE_($dq^~3a3EW2%z1&{^Ala>rp@J!D(1viLZ#^DlA$%dPC!z9PKOrF6zNPpI
zmn~&&aQk4-SKDk9aPpr`t8%bPJpx`VMq0;DAK2ARvI4tgpol>!{k|0baq8+2ZAup{
zj}e2)6krh2k2@l~PQvy7Y=H257wwYm@zKDkfis%T*4g*J_GUH|MCAe!1vvR)0B4K0
z_#4gXFrl_zAG+LUZSk`0YtW6o<;pj}RP-=_i=Cher${I(?e0Hq#LkoD-D=4j2rW%<
zsVV60?|ui;fz78*;eeE^sP@K$!Qoe5#UG^7;m6!qUXQ^Sxe%Lek##oS6kt@)IfA^j
z&5OgtwjV~Zxpb!TuzUe$cw!-<=M44ANvb*?faL-H(!aZV;1o+){W`oZlec@JrkJzz
zGcZ0&x;f-46DD{*_lO{A<+)wp%sLS4pk_Nh=uS?J;MSBc3e&*LzBhi+|B^cV@v+K?
zqvv$Eeoq>2>*oq1sgj%I5>{ucRTS+RU*)6+d4XD`YUoE|`#bS&0D%<?=uXzub_Ju7
z_yr^Mv0t2FM$gfeMrn|yHOTyX?1#uN*<W#UY+oJ$&d#076Z!p0L%Bc>JP|ALcpIvJ
zAFW{qE$58L;;kBE<vB^&p|7)UCANB;xamAtcqsPgE?`MSmtRQ+K`V!F@TSe-Em0bZ
zEXFItC8uGL?J<VatFl~Lc2e(sm)%kHB!NQ~>Y{1)Y?|+|ICq(vfISS1f#wsbvH4?}
zMAT^+azA=;zAz`hSm1#WLq=F%hCmA&9jb6?_ziutF~?2Zx&+6AX=4uI=RD)|`G=;z
zMM`0GwX}?$#vq5gpZapHL#g&y6#(qS{sjXMw8llN(gn*+0omv$Mm$#qi}jU~L&W!W
zt8B$y)gW2BHh>h&b?Fshm9-UvZi#YJu;@`h2G&N6ert@T%x>Im^M!9e<-057pAV*h
zQmGb+SZ)EbZpR2y<^A2Mt0!WFzf_XB>cHH=atuR&h^;D<y(NusW)~`1f+DVAjK4LR
z$THQdXNYz)M!R|WX`dj4x+%`fnir<ZFrmbkTaHJW=_({*@16zX+j+3MG-xOjaIpu5
z*dE`}hZxq^JFPB#rM}}e)3nbcZe+tyaQ*=P`SW$f91ypIdmf`j`J@ogv~k9hVvdb-
zzdJjh0-R3tjrUIzTpcCnqx7Y|85LiuE}|680NZeW!Fok0GOnLoS_h6pjbN&r5z1Ks
zD6%fgqA(J`Ouk`kHT!f}v}(riBR7axcqI6MKOcXOomgYH<Ov@3Q(g0O{aZkFQX6jn
zAc>8~CyH&Ll&wlk(mt6oMgH0G6I6ApxJ<G-Xf~_bH@|l#U5fx!CY`L)<xCL3@b{H@
zPi8S5xROtGCp1S^ZPlbBTchl<0>#*)_*$skZ><VIEe9^E79~2?4kV=fQ?j);S(i2B
z-EqnJ6nCIqjblM>@!`A(ok;>NbO~3ii3?Rw5`gO42BF<9Jy-;D+p;yPTqzzP@AT;i
z@|kM4bT<}xUm)@*%d_pUJ$&UJy;}k8Ru9(jF<>ZDK3pT9iU*9`dk6h>qs&c^DFt-_
zU{lNqY%*Qg_xhrc>7C?Zli@jHu&4;hL}klexjD<lcsFEVjDF)M4w<9+K2FaZa6t;(
zmMC^<fElm+Cek$TOv7iFNiu7s;1Q~vQD(yR6L>)AlvLpW)}~MFK>!k2X-%b$^L-B#
zplRd95%Dstk9^sB`haL}PUHOY`+Li*QdVv$K!FDUt2ozb)WevyIB=4by<E;lK8H&H
z;MDFWw!q+I7nx*VAI422`3^c$-Q=8KCLM5hh5%TOk`9P(lMl(l`IH5j08dcKw7vh(
zmb97bT)OH!$a9*^X(BhDjQqd>Z^*aTT`<We?o_|`7XcbnA+P)>LiFaDuc#-hsLz1B
z`V@hif=;k0Kdtl~4|8q7Sd=tJdaAmrKuC2IKL-0jYMo8X)@N{W`_OvVw(q<zOlD7i
z#AcV6=E_8JOVw%bB*R7R#U<?%c;z?*1`^m8pG5}Kh9QXNg$%z45vM_AJ%XMqL^nf)
zYZcz?GzTor7)3<F>?d9|0krnRU@DZ;T~wy=+1XL^X2GpvbJ-ez9vXPr<k#A;2q^YN
z{rPSN6cUs7MsDGR2bm*=+{A{SV?;mgv%mr$19C5w-)SNh%%i0#^kc5z*oMek)j{~(
zSn7Knhy))t!x(Ylax7d9^Xaq4*TwN0`YFKStRXbGKF}!m`chbQIP$SR*6lu8+6)@n
zgSLGMrcT;D_Nw6(=ES_yujvSkn!pqq4RBFf&lOf4Wezb%H#_0TGeN5kpiqq8T9S$q
zAvLJjIaWkGXnttkY%7w@zW2EPFnRX5?i~bkhU}^}7sYe}<n>PwpA8k3zdJKPDmp|W
zJ3^+t&r&&8nmU+T8?<GA*o(!Ws>Awv=`QkfAAP5;bu%Hy-%5*5J5Gza=L!i05{O)<
zHKg>8Q_Rn5itp@(=hYl*#Z(IDW3!6U4=Ee^z_R!NFp4O&*Q}ctXuB8ci%s1Inea<*
z{e@opBB_Bd4jr&)V%;kMV)?<FuOrz+Q?X#9Pt=r$uN~oc@cov8w1f~p#P`GYH4FeF
z16(kr8F^o^vWvZRW(OrafEEQ}^KUmz1UOew&xgt1@JK3Q6K#_g3oNAF0xP?U1`rVG
zFKdE(A0ASwVEH*CUiFW0vZtVV4AEz->G<6_QkG$eD@M@nhxyl1qA_Iv@l0FSK|}lH
zGn*US%ZP1pgpubSvjkIw7rl$)h0jn0{SKP-yY#<+A~gf0TI@CPJffk2od6_NGgQ;B
z=x_2hpga9zJ8pK;Ll>V^jj7G>L!0@w=6_`$kn#bm=O^3vJ*0LdEC25e9_XX3t<8o_
zzgfTOaDN9mg2!}0@aE93i-y!aOY3&~8Tl0bPhMuh#uKy$`zjNV;%mZ3-<=;nn=Wj3
z2s?DDzfB__+$;3m3G(d;)=c0UBmP_<&S5ozSqbKn2h;CG+d^~Mbg}-w_^Y%M!vcl)
z1<R#uD7K{F@~i#x`&VJ}!VbQwASMcq$RhF!tp3h!*5J??!g^rKw&a5`^$95lUv9!<
z&h>3C1(6@rsUV9(eX!RXLD-O*1XomWu&Ux+<ApGv&Q%<kc<*J)5&QWe`R)`m51=5B
zzD7%sA1RU7$8SpsX;WeYP|vqRh<Zony+fPDH_oX8`%a&fSWMZOdmgR3KRpg*Hns%Q
z<PXwr4W5MUoS{DKjW`o)kI4Elp)&K6XO%#+a=Gk08E6)z<~4<E>ubHc$z%jUZsM|4
z14QZW{=@+gDkA%Mskgo2`6;<F*~muPEf;%VPQvDX1H@qGWxAqLLQc^7<wq0JzBIoN
zs|AqA4&8ZY4qruew30W6&QTQ`QTL2i%)AasqWFsz=PaPS;ca%84=;MZ($%_r=s}0a
z7rWW!ggk2E_1%4IuB)t^K0Oa#q^FUy?&{~ry28Cc5NV@Q?1~6)u?-y!f5(#WbM1N7
z%Oa)QaWmVRL2F7ERFHPfbpRUPr;jr@O$1uLl)8H?D97{M=^#6nx5=Eitw0qlwzy46
z*mDeglkPBU$yWSv!d53)Q2s@KUDNOV2Y8|t`pk%rybqKo?I5ockacpzN=L}n5X7z!
z7EZv6ym=E;du#{nias;dk<UIa9r*wO{#I^WG?L4($xF2d2g=LH5Nx(JP-vUm`1%y_
zv-v42Bj!ut>9d`*<LO6uVsgmTCgEk}UM#WU&s2jwLW+|fnrfClUi=)!%_;lYNKMZw
z5V8US8uy`3PXx(^D#4r2&C;pJ*TNe3bA7otj|>1qNm{}ytH{yXMz8ASXs{HI)IWbp
z*>{Wx`vfAM#;Gdr08mnYam13T5n9qr!gkE>O{ibLrYbx;c(YssXwDa(P&w#NIzvd8
zX0|A0P&vHDYxMlJh)t`V)pWgOE=cC20`yFIKhQGERaLpCx_ymDb^I>50YO3)tg5X%
zn@t?v2>iMn#;)5iR;{t|b|yEZe0y(OT?M$Q_B^kp4kzB=1LnI_kHnnBD;bN1%n%fQ
zW~|J$!pj|S{y5S#=DiTKbyTAu7>r7IbH-<fZQjXDS}$kc8kc+#tFnvCFeFF-tlt4%
zTjwpWQ;(5~7|F*5=*a-@P0xY5F2{skMMpJ^gD3-sBSj9Q_zuZI^4>v&sBS^;ofP{?
z_CY9pl5pza9^@u{e696Z{Hr~g#1QFVY!*=Mc>|=?=m0^0KV&C^N<`$~1&2SCUl5BG
zw%ITx3JIcmaKQyu+atLBZMxnOL4_Y7_SRI5X28NT{Pfcf-Z*4`Pk!K;cs-@oRs>Jl
z2qmCw5F|c(X+ih<Gdq<zNpIwt9&CRqS)L8PZ4vCtKzs(k*JT8cz912TCl}32CMHK&
z^FyW0<TMDXV5ra=?mcB3QR~Tad9UbNaP=?|SUWki#fr+g52-C3JuUFkk{^Egl>(J)
zrN3HEvKmNt(Z_=5x3&I8so~ZVs$(fSbmK)O^-bw|Pwmeq7CVo7sD2Y9VHC4J05VU3
zZl?)ztS0D9p=yfRz*hf6%@~8@e)j4dihme#{H=mk-<f+q1YT2<?7~LQ`pvj%A5wtm
z|9}xvv<TH00E11qfe#9h;x`7yParQbsq?i1*#=BD3hon5fb^7nR1I$R%8LBX;vfUi
zn^E$bzRd{~^H_kHSoDvPIIZS8tAL&+#}5&@g#&Wicek$6v_w*?pBSdPuS<sNpz07k
z_gk;QZ!3cSCAn7Q1T_2TArrjHt^~0*?^l#>g#hg{kkAF{4KS+iwXc(8LN{uwmF!4m
zugiz)w!pT=gfgB2YZfrmC7NHlUgad&+=Aw%U?2PSOL~rup5!ChZ0=OJ-QxtpVN9*9
zu{sGLG!FeW0c=kE)0Dh90MmLRuRY-x76{>-u&MWZy0xwpHVFKUfob>Kp#^tI1uqrE
zOAB6!gXW5%<<D35@;*HvW!ZB*xe<Al3UrwzhfUpK7T`i(`}#0noaXY?U8Y>*pneW8
ze1+fE80dbau4d&}6cJcDpP_n1_)1;J@9iDPMQ4||4UQhbhsh~(D5UNjN__~DT7m`{
zY?<%iT&)BSLf#Yp7dM_947M|&AG&EFN`HVVX*?X&z_|j~LlS^_PR~$9(AMI0j_pJK
z*(Bq`eNKokE^{)lM!v;PNgI_;T=r~yCV$RETYty4_yw!`RFpL(q=D-%Bzu3pQ(PQ@
z$5iIxF#_&rS#UOXRt8Kn5}i7kqcCKvI=kzMM-W<4e5~wiyaH-BpHX%fdXVqzK6?zL
zVggs_>u-FGxc7p#VP@@!@wfCBR9>QcmkpelV78-fF@+A{<V+tuRJzjFf~JBp7$u@W
zZJ{a7*w>lq3ds|PNMpS8--@0hy0S6LwE4jA!M5>@{YvE(&XiYLRX)HE9q2evPC*Ae
zg`)eZT>UV&%(T1e5}#d}Bq{pEbwsW=_ji3tTg%MorCatnHQhC9!uI>L-Q4Ve%en~U
zcT>Y~{T9WhKU?_b$dL3_vYI=@u1Nt4z)u&><H^o&lHuy4k@cPX3wmZ$z>igd2{~xL
z6G(Zj3kAZ#9nZB4?CWK#Usv$5tak6-v651-rs+x=a1*#c#EKl<b!GgC9F$%GC@p0`
zV3gtl9#f#u!U94MYNWJXb16J%H`%F`EItI;7#V^<p|!@miV*W6AFDeB4SEh#SOY4X
z*ifq)7jMdy!>9$R8ygF3v(JD^b5()H;28{+vGR0m({6rdu^B?)qOK_CUb`v3(6S?s
zsz2R}^OhHA{`4zwKbRvAbt(W?^Hq8>zabTXR6yxD7u9--p;a;v#(M~0EdR%2{y1oy
zow=8VAI0tFshtwGH=V^uNwv9+A$}CMbeZ8@{$a@4L-Cf16#qLv{bzQGsiYivWnlMq
z61QMIN~t3O9eQxFIHG66<ZnZm{j30RTt)Hk8mvk7?;$G_0k#`lvg}5TTB&~hKXz7;
z6hC*rO}qpZka%U@+j_<TDmsUHTIJX$k;3k|P@I~18<R(x4oCF}{)tZ-sy)65Xe=E2
z<941e3%DYfeO$^96reu%g5U?-r&g66A(w95Av{4o=YiOj%DGIwHUb_Khe>v*Yy9Af
zM0Fu`B?3U7o}Hd2$H<==wTI5iaq#&R#ZKhp!kF6fnx)?9g{^G!Dy>+beVA8BL3)58
z;{c%A$EmZ@wB&>e(i0Q%_croQArwH9rn>J!0YLep!hJ}+gUL48I$M(gypEBw?ioOp
zlo>=9u|SnR4V+=!vk{^`am8-M32t{|JHB4m-g~2$rFP5c)H%_XG39Z@pI03s0R@m-
zdmrox$kg6B6o)$+{v(Jgx_MY00#XvzcMg`%h*AwmPRoY^kIVN-*Ph^n?$2c_xHA=B
z4xpu&FHwZ#+OS`a-Oit@ylo@+V!)n*@5|9=yZeW}tR_ts9lY@+R~s%%ndaQT|JyV^
z9|=}11Lp1RjX<b20m*uKB@K@O`mOg7#)%@dq<CBg2y`clT_O5OR}04JJHYF)J>$!M
z{XRHsJHTAP$rdF)w3|XiPhbJZHHis}N|0X}bJ+L{F{Wa2dywERY|J$6x%e7IB1*fB
z`M};M3prA1s$il3oG<5b$;!d{J?oo4v-d_Yf%;H_f|d@W_R)n3+CD1`iSRuHA*^sS
zZ8NgZ%^5O{=X`(7pExJVd15>UCqzBhAHU=O%?%1p$H?}Cpf<pS^?v(^)^%+CeX6q3
z#|D;{vPIz;dr}Ho22`SFiL)Ox7fSsysshE3=|oi&NlC(@IFl-eaz1x50!40L%|<pS
zsi19Ne`jAE=jx4g@`?oFn=7o#9j(Qv_u~D)nN$`b&2Kx~<$-qH5J0=M_T#u3>&8t@
zo4tQsd8pvRSR!uy3*|D-38n@!$SB1Cz%8~L@P#2H4DFpj<pV}|Sdayag^6*K%J%n9
z2D#0!?O`(%f5Eo;M1Wf1)SLcMpedf~)cFDMf5m7bDR;$WUchXS3VC{x>q^g%sOK&o
zbI?Ra3_(2dBjy#bV?58h-s^CIn15eSmcGh!>~g!+N#W;uP)VE2__di(`iWPy;)DiT
z%FcYgXg_tJY(gbX(USpSc&9p~;xAY1GiTw8L>ATa-{rjX{}H=)&pasN9P2ac0tZuh
zmL%?FdV8uy!DW+Uw|}vmxLQvYPRM;6mHWHP4in_(yUc=)#FFJjoG{$c<d`OMATI<!
zN4_bbuZsgCWA(_HnOc3SI1pcPq>KgQ><)#QL;dH>qYzF2<qZKUMSNPoD9C|;FQ^Lr
z#Y<SO46>gJNzS%Ly#GK;*ePZ%PAWFe2tRX+n+LA=Sojpfk>Q-{!d_enawj?>H4lQR
z<5=vXxuwHn(U8<BS#2<m9K_Y(BKKjdr}O&ck8`Nb9g@0}xK?ZQt>oh0S|K)({Llmg
zc`95)&3O43fQAG1$U8XdSPRm7GL}NS&`-RCn0k}_I`Ls`SW|~B@req&h$$(|C&uHx
zN0di`N1R8c1M4Tl$gUF-Oi^7b#U<%<)jMrpK`lC2P$O<I|Ecz9*?qP>F^bP4AgrgT
z+;~QXFd$FP?)x5LV(sn%K3VgKgBQTbwEL-$sn@aPyl2n{Mp);QR<@WZC{=h2h}qbP
z-qDzBI|_xK`?&%y!`F`TSdjE-NjOxwiq^OQo$hqM6(C2Pfsb&GFpeA^fsI^j=egSh
z_5Jt5QiJ70NAJ}bJR(U)l@;IWeNM&7KE&VHcwP!i89LBQ*3hN>k$HnFp=1F^h+z+$
z)}jx7dvD895OA_hKH>Ve4t~v0zx{M|Z~$IEXW8N?rx8xPs8&*e26!PhqUE=x%f=yL
ze7Zo>NSZpN`zhIF=`H!!tcm^X9!G;|suPPQRj7tV*g2pMZ+74GzL|b+M3->!GkAfS
z>2vCb?ySJ;=~DG9A}~pL>wNW26G+PfXtgEv?+xj<ondnSuVh}`TOnj8b!npSf+6I>
zN&D0j-mWiO>_!22n{%os*3AQK2u-Ie!*__p%W5rIvA{<eVBJ@F=z!q0q;A$}@7%!E
zIl0?-N4l+j-1OTid_PhMOKSf$n{045_S{R667iR*FD8rCir-00aPpi)*nCGT(|U+&
zJ9DSRYWJRYyZ3DE`lE{Fy0ru4t{=RK0u3<WRuY2%u7#Ab&ByhpD0-ILakiuS)(?V=
zPudrl*dTx<V??C)F%`aai0pJ%t;w}AzJtZV(p1itpxIjpyV(IZD!?K2&}oSj$TiMn
z1K#nc0ep>rWhRsvtX9V_eW6X;`s~XJm+xDTzZyH8V$OBW(ro0Yr9n(d8cYKu=$W?|
zVZQ7s`r7W?X9{y;lJ42xf+aBaet9#ki66THup<1RmJZTG7kGb%I3OzH1ji%;Nj-EY
z_S8cw;zE}r7K?p{ap#2;0=9}oUCwgaq+dcue1gdMp;*6;%?e;X5DoSd9U#t>>o+IE
z%4sn+Poc+g0f!hU;2*?_8->SG;2OXz&>ncVrYfli1WohzPSk+o`v!c~KH5{&BG`i3
ztGDd#n2EKH<)|F>c_-7h98gfBY1B5Ar#n)UqriCND>fm9u;B3i>*L)1F$xINs=Nh6
z5q-jcJ6IHecop0yW)KPFJDC@Wu5E^p5l8HEMT5FQpqTZOB+)f*ocJA~l`0fzk1-;I
z0*TP8jkm2Q8<SgKoLhFlqV)!v4`hdyLXN^|ens5bRnwY$eP5d5_j~j#D*~v})WU+m
zW%dQx>L3BsgCL;IXkW~#a3(xd2Z#;kh93+*+D(IlPC^3-q}EEzS}ZtdY!d0xAGpqp
z%q?zbT;q=_+B?ZJB$GTNN<nv9&|BJE<V_Sm`NT3Ul0M@&?cho3kPfZx!;8G|&qpQh
zM-H91Ye*%#6VlV#6<6&UdwJP*s*dADzdqOFe`bCx(!AUz?22B<M)o}g^mk`1tC2(M
zf!oU=;`U$OGethW7Q^ERBk)CNk4J9PIevHS-_Lpxb~{ff(!me$Q>VD~QF9#G=OGbl
zX>swS0#&1k#0OrOe4&;*qa?q=|C`_u%FJb2eo8vz{9J1SxQPw`r-!qT3zPl?1$3l7
zG-_qM-DlB|l#uoXsh$Ac{eYfe;QFCt(GLOcNN9fLl;Dj+gI;H<c*WYy1sX)wToj^+
z{5=Ni@8z~lPdA;yet()m^Thh1=DFD~7+JKW#F9FfuIU*E+V~r>TGHopuG4QNMx?3^
z$kR5SGv%W$xQt`cHIOOtEpz#@GLb&e@XM>~L2h&A-;U`6mxG5#q!DvVNRFVr<g^bc
z<`W3UG4|UVUk+flwz-vChFTG@Yq+ll*B3Y0Nj7hID&VxzZ{zo0%<V<oy@vWaFBf;x
zg3OQ<>~l|x$ZUS)+2A*q_E4EuPJ^DtUewne^$GlajA@E+4>OpCd5!|&Iujq2bb#q)
z)97Lay7T$ibZVs@SL&q0N_FE#F%&X7P`?6&RIn3(>%e6S!er~qm-Z{W)a9s$=0w*j
zo&f_>#^OeC6$4<p`TYl2Z9=FFv5yvCeg=wOKCY?rijO;->3xgtg`?h`8M{WGI24#F
zEsf`8RjXUyl|C|VLya~1=s>DD_EipZOfk0&&$D*%4pbFlyDTM7*c(L&#oQ#k?L#k>
zC%WC#qex!(^UJ|^xngnZeXMu$;781b&kGgvf)?bsvfc)T4*Dk>2P+BE2`HXeiZg`$
zKu!$M<2R?#rGyy3>=TG7Uw-u|qhxq*Vfq6~iIeK(HI5T*bkpoBYl54Dcj<uA$y0mJ
zspKO2$mXz%&0(8<20{v{;a9CXg^XMw;Usq4R5~s4aRkBYn4Vah<47fbbxa;eIy^Xc
zOwGQ7wOEf1xPO<sL46rt_xwHzqUqDdgyOQdl{-R&HBqtPcBxZoTO;B*Dn9h9=xF@!
zuQK2QkpDwOITWemB40TQnsZ~-H<|}RH3s*rgCnRF$DQ9p-p6y%UwM<oNv+5x3HR?z
zhboG)cD~>}>)6UztVeT-HjgTV4R-w_x>AHykM2yNR*L3;JmN@zaQtCBB0`x?y6WzF
z%G}4W(USo<Y%oZ%iG!L3I*O7G0il-%(1&=KH>Ac<j;cOF-10TJVDB;ATeH3VrZ^r>
zFquT;<mr(}4w1(ryk<J=3?RvbVziljP9k&hGidE1`r*xpR1wnz_Pd4=5*Kp-bn!lz
z@T|Pi>^ytxamSyyice~gDQO*@eEoc3vph-I?+YS8WYYpfHsHitaVgg%PA?(-uaFN9
zu)A?lpUtRW)6^hz)6*8y0f01zSDcBHeS*EkDJq*1*aV}S9!(D)XsnjBH&|Y0mZ&s<
zfIiK~F71;UI&Kxn>~bXOHWaAsM7*@zrxalna{fdE`4Yrh1o@25ayAEo>bmFjZ5=03
z{L}fb=G4GPxAGL!2S%!e`+)JRE2IZi`a9qS=Y>yE=bepsep1ef`BJr=(77wvuGNr_
z9}g&%1fVwxXGy+@_~+jP@{-MKp3w*D2cAr%jeA?enEP+wAI%_jq6;a;JFbaXyVN3A
zF_3IY_?Q~}=pszU9kF$h+G7xE_70R_Bs^)i{?6#MlZcg+S>7r6^)#3!|9v2&749~9
zlMzlG^9=HL$bR5~5%s4V(>GuF6`|&F*(x#td&&dsi=9k}^Y57ud#42J&p&YxNNmjp
zS|kA{<h$FYy_z-@k6dbq<sG=d1?J2aW5g+)94m`rSNby#VTw*U3N$CS`YWa~lVeK0
z7b*cMES8RBJL-Z9WVoj0b?@lEFa8J^4wq|!_*=$jo$HUsgZ?xIdw8l=ZHpH1HZFri
zQtW#cfhhy$Pzw-Wv#cBCS24RUyvpaIC1q*<IuJC}jf*S(Z$l;SYug?+I8E((F|FY_
zVWI{}LC_53wf8@ev=mT}_&aP=pwx9fW6qeo)SE>T9f9!hFdpRt5QL*$jZpjeLzRdV
zw#4*~)COLY8}P+0Mam=rChYyJZoPv4%t|ajRcgQQ{g_Z!L$0;zZPJ0kc*C!<0%h`)
z@6_|2dCKh<T+{%<ac`UEwW;dCPbZX9!}QXunHid};hFV%1THsHiR2bUh8Nr@>G3!*
zc|^q^iPtoNxp;(m-09E2Jz&QKl^I})UOX9h@$jj3I1OkokwBG17YOqS`&><(l#G!)
z2R0$f%jSSu@{*He5lYtyb*&XL&QDFK6vYNoVUIqe<w1sL;+Ub~-fcS4uo}-ZG>L@_
zuNk3sy7nEM&hHflCC)V%Sub^CF@AGOfNahU(xS9L2<<D{?$36@K~x+m9?TIp+XE|^
zQ<zJL8VL7|p4>OoqD}y@4HKYo4mQwoEsPDHbr>@_v{=CS$%c7XLfijvQ@8Q2Zn0}r
zS1K>NtOf&Xm#C^L?FUEC-QvRi?jaBk*0GC82AJO1GvN|5At&91y>>hKHn$1CU<q^-
zLDu_a1pjh)`@?cUxYJX^LvFk<vlL-A<~axJd6@?{ZHElf?fcb?D8_|gBdmh}dnY+6
z?4KTiqrz&v)eFO4s~o7m<ObWsB#i(RWm|B5I~HIo`Nr2S&+gnlJp4mXE{XkkROQAI
zfxuUGiB)7sos3lh#-Yt&aUwv8h;K^<@LuZ2|NE!Zh}4-<vt6NWW3qTYr1dQXfFmnK
zwGV1QU|VY6B2(qk>(EUtxtDP5Nds%ZdlG!^>{B7;FC}rR`>TZ&9hMDe7l^x4!1ch&
zZOEC?`NI$#pe?7Mcfff_**leA^aCzHu~^z((aL_ZS`msr5AtydovIFlQ7y0CP#^|V
zQ;)>0%`ABIuvY0%GY3CQiWO#qPPm^(H|;PTy^p<fpf|i4l(&ta3s|~|0vZpOAfQ$(
zq74gtn3RwHvjXTy9Uw$}yBhh7Y*w^B8({`1RfmDBz1=k!@t7+%`)Na{o`h8y4G?@`
z_}qNZ2|s@cKKJ^?y+?d=A3mkyyf2-r!Zb7YeaIGd7qVUXmUe5QPl#d!Ly=Vi<%!Iw
zri;H1c#stZIqo1?e2E=~*OF72v>{K<Ut5}W=G59Q#OCB6(lh8#1&*B+uqRS1kw8AM
z4M2IkwE997r~|4AWpM7BAsuq{p}46JE;1IaC*L}WmACNYZKFgFHSql+Y?R7*j&cJ9
zeR`0B)}z|_=aoRP=X_S<7d0wnlHSZP=AJq%MVY#=Be?7`NbTBowB-*q+(iTV>0Q4~
zAV8-Ve=}+@-?{~;6tA4&lt)<m9hp0NE|WEpdLt}ZGKl+q`<r7(?wM-VFzXY~uZrBe
zRWtpj6k;N4hx*z<b%7Q|z>Apz<A<(C1tnXy)cnyJzlZS{!9WJ&4ltqWltWm>`ZSf#
z%MZ7FhzT}DDD`}Z`ylT;KyYt=x*Ll*3v{+3Kt{g>q~YcO4-3CE>`L?XK2y%yL<ju*
zB~L8<%-&qDe{c0p&WX>;*-y=td=ksgPH-Xnk8l8+5zC8VhXbar4VgAx4CdC1T~*oJ
z(X2bK-?O*B{>yJ~iwW2@$!@J<AVA><2CxrsyIFdr$Sg3^D9eN*E%?@dB>S#%{Phkd
zo11&d0`n%6c}+J66<f%M0LD>2@Q<B$aBj7G0csOEz~<IrAg8@5{D7@K^cUU0sb<pN
zvOtDv00$6Zr*-PAhz2|>0Hbdb0f_<JT#ND6b<=`O;lGnR`8EJwk?{My>B-Gp8KilT
z&|lc{m7{0n4_zV5X&oQntzI5~1+>QA#7VW-&2WA~vx|jblaYOBU}f5ttNRoO3V$cr
z@g~{Lug;uT@;OZps*#blP2Y7^C);whBA8iucsiiA7yg+EASG{6?YPj#^QbpE@j@=o
z-dCY=W3tj2=o!(-fc9j&pD9vpv%TdRFNp`GI&0J3xi+;T_+gV8F=3xrqx7T}Ky;Y{
zX5gvk0?ZtmLVpQ@t0t_-cm@q9&6I4neQR{>K>3tm@s%Jr=kXz4pkpZUb~+vb{b!W{
zk6!S>Y8CRE%6pll)w{50e&$aF-93}+^+-KM0>7oby)>8xPsAcki~7z23sTt4bxnQ*
zi!Eh4ivSm^R!}^#-`{zh+SLl=E}9oXb;|GOcTvl0^?t{u`+;;LH_&{!PKS}d3se&5
zC`p*Gy`CuJ%tA`7T;zloZHn|1|K_|W(32RA1GoDN$?}(SP8qZQGe?C8HFcP^nPX!E
zyu17wCS*x7h>1^XX?Dk5oUC^Qpr2hmBrxY&{>s?2isQ`RqXv%B0JX#5n2!TO^D)Tq
zt}_5$C}<`~LI9=bIjxfUIW3UauxcHy8S?x)?39_752K_@4{BX{vmE1Fk>z0M*SCCy
z>FtZ9<*X|LIesSx{%nDOy(vH6JLQ)cQHN0(RH8hUbC|7%h33%|?DF6lt5Kb~W&V)l
zzf+j<L+e;f_AJXAA<a9_51EjcxV(WtAL)z~mA&hgoC0AmS*v@+s!-y;Ps%?x53ad>
zpZ!wvB436IyzKYa2dX*JrWUMewlcJaS&c1f|M_sB3{i&nEr@8vEKck!yr{#<a=?DA
zsQzqv6I5{Q??j`FcLO`{mu5f$uR1rj%vMZV@LrIXcFuJjdq2PIwf{axPn?<F)QzD>
z2AUZXhoy)K;ojg<Mw?;|{lLWm3qT-7KkNS6)sYw}ifQ31b!rZBV$XiEY7vUYh_**5
zXsvH3D@z1LLI3_U+n)j65OHmLWrF`Bj;s7+z?W<Rgq8(sv9gGqK?E!_?!V6h6K=_?
z^%KGs3)!+n22Mj_0<Sm9IE|IZM+pmRZvHfI3#8uvz5?ZpMTQd}9YfwBJh(9MQ}#K*
z0Gvz=u$U6Gh;FLY4!)T1&z3?7eC|eL8bTv}Q6UUjMraR~jfg+*R^ydTS&J3<aTg?o
zLwA(Se<%9>j5h!U%Flna49YvdXji$A4HhUToZcJ?7WqdGR?~ySe<v#?Vqk-k(P(y8
z5KBHz*CF?%vlc(0Kig6S>$rb~Vk_{4|33qlNr$r9Mmn^<+KeAS(E}Yg<rvcH1!}lk
z0W6+-_49w{k84YIiSviLrkgtCPe0euky`R4kZyENPR_e4|8_6P2qB13k&<2)8HsE$
zq>_c%h#Dwk5cSG*aNXTxlli#+jIla9Ag#oZf!Xgki+CyJ*>l&Rtqm|fMZU53Gfl0>
z{_~k2C^?r6NX-L=PNPW60|Qe@v=HlyMk%bnw;$jhe`o#Q2(Lp3x}#-^MFC?(N!J7Z
zl06{iKvMv_S;^#59zi0F^!*L0DBTL^ss{%Nc6SJPciR?4j7<&c_?8f~1VWm`aq^^A
zf1*m{tIf+Ra*cWOpYNWcsQ18p<CxN|?{)7N>5bm4*ew`9!HZz8ZK!I1I<L3ze+I(^
zK$#kEr#Gkl8uQ%EAHX~|hi37WKt@KfoX3Auiu`A_F#^MimyNBlsmRg@q%$PrDZQyD
z6Y(Mo*vs;L4-QJN9sSS4w3H9e#03BR{Dv<WMSozhc@1h)9x?X=3dngDqur%n82;0J
zwYc@wYm4oPyq-~to20x{Bp-nzq69L$4Y~Cr(PM7SmSp#zr}Y3L8}AFm0MgZuteYT&
z{cWgrL(qOdq5kt8>JR_3qdeUFRzj{hkHOe}&bA?4Z4$(_#j(77Bwk(<^`EC~BO+QF
zcts`Fg${l|o2L%}!R~pTYNxo*NB-BI><|6xaZ{i^CzFU@s3a6Lq7+JK2>y0hTuXv3
z;JGyayDg!5VgZ7u<qg0q6(33aX%b9!Gi4D@M_b%6vp?H~6%t$g-xh}Ip@>0%ir0^q
z5_=cgTe3GvW@Um}&1z{FSuNG0cbf)Pfuyl&=D#0%lAQz+7pun;sjm(SAy?wEf6Cfz
zTmY}Q$e9+ybq5%I22uSxwocqc^B2YS%u=M1McL;gR0O|mh>c#v<q2sMI*wQYv42{J
z>OrH31To|3hF@~onR+N^NS?h}&d3WaNd9pq2{dfp`nT_a{ds57L0fsIdNQ}!vn>NX
z)ZkGrK>p#Wkf$7@^G!`snv`<w@AZb-iUxeDxuVD7<q}0^8z$i40r-11L;BZ07y<s!
zLx3fDbN$~PM5u|vf5ETUc^ix#vLGgiAD9i=DV(Lg8xMPu2_@F!4qLut{DE7uUE}z-
zh50lfyZaL`ZA&~|fj5k#c00y)P>2^TVZ+&FLeF^%@uD*{JAhMi>#OPinh*x|ss7p9
zM_Z8$V{6A=5{mLLJf@ry>1ZvpP+?D|bLn-1?Eib(8`#m>d5hHTUuS#0fBbh>A`I!j
zsZ*t_Mx-W0QT8x(iQ+z`|NX)U2$oxpZ+-7gpT1g&DV{O0_}%nIc`bk~>P|!h?qm34
z1@~1Tpz!xc$u>YYit+Q$t)<e_l1-#@jM(gWlH=LXoW(D~33T;A>+a2G?zJ+r|Fef6
zJ+NR$ylCL_x$&1Y4Qh}YX|oy*ijkjrg*{j}pP{`#ge=1fFglO_eMOKr5Lr!82?ezG
z$arm}M-vJB#2G?)Nd=w#Fznz!SN7lkKdU$gsM*BUxwb>}qC|OKG_rQzEY!Z97fQ?#
z4!5zd1N9j0d;D)Ux&Cc+12@1%kmmOGw)f*-V(m)DvL#6$;Kj`J=kIakpAfg--JCs7
z*tLB3ztd<84XQj3Lld~YkAJvNFmm-9U}?!VME{_?A;$~$sz0q-Y<x`l8}#4N7CrQP
zKQ`_8b*Lp9aqxg{K!DSE9R7O?d=nJ&zhgXEfq>*y^a$5`j9;KRFs(!~(GO*C7kj|Q
znIfB;xz_*PV3DnJWWV=!sYN95hwc;Z8{vztyO=)M{0x!e0BN_ri@+=B-9LA8IGMJ4
zclMc*_pQtPb0$qBXV_s^Sn7$1Yo~ms2R#4R(IK_u^0xuXPs9ns{?SmsXu7UC@2L_Y
z;(>1ezehKKFDCQ9Srqfy4&WhvfIOhXgXe%{kbf??4hj6bfG};xh?$db))kQ7It2;j
z%BFzi_*Xq&3Bj&84yGCI&Kcu3lDb}|X-{)LEERnU<$TXT|BO8tb6D@^#gek%GV{sy
z3#qSaU7op=7x;Mi@Xd2)^{7myez<XM*yh4aZ~1F!&c43xzHZIan*ICDR1yKZ;r+p+
zCE*s8zJ+~a`0VU@`>K!!ibJ@9N$Hus0D=fbVTJHC#3>q*zSH-I$w-nvD~=`j5uNZ;
zYQ;(>ZXw}M<ySVee?J2r1?ti)Ouf4~6>H09I($%{i-mA3GZ#7h+RWkY26R`-3w)_a
zXe5q>Kt(E#LS4G_S^bk}7!=iY#Sr^s{O;XX<$wQ(#)RV6M?61CSyx=WH-CEQ5I*ko
zEL^33=EDarDR|2b0q{w`zw9XuM);`GQSnryNO&NO^guZcvS-$+w6L^vx+!zPc;TLm
zjP1z_rM*CY{qLJ=lJy^N1(*#I={Mwuw<jj1wlAO89C~`EiUr4VD~--x<9wPYjQa%P
z;8Lax8TR{A!AH$*!V!g6pUW>Sh4SFvu;JIwx7e`|bhF%Gtyg`g{T7zyPlvV7bICT>
zD;EVU%-#C89j|9(zxuxCIM{m!Bp$A1=Q=PFf?&klBn9YJessIC^W9}8k0XX!L6h*q
zns-hWc#aJ!{{1b98TI)1^4VM4gBA#40|#FDt>zV7TEa2}wP^Jm(qhD6A1Gb2Xe`Uf
zZg9n`?uI(#&qy6`k*t=hW)}MG&fA|LEUoRWD1bl|f{#;cg+I_oD?nQ+lwU@if)0&h
zztctR?d_$7ABg+-=`^tY>C@R{+$;~5<-4qhTgTq)pTjHHYnn&#;xSMn8u{s=I68w>
zP9l*`DTa!HL2ALRHYxk>d&2}sHr_)cjg9fU6;;{OY1wepsU^@wf}SuKuQ<9^3jEUT
zBQ-GH`hmyc9E$!<tS~N8NZ6$Hg;Xz|b6fjMCy{S?QJGgULSVqXb<l65(5fQBnnnYT
zygz0Bj0L8$W!9@Ncy?O>X*HCs{5_5r)wOH{@ilzFOrtapV`q0MV~@`8{M(72nNiw2
zw>89FrfoKA?$hrNo&&wKd5%L^S;YQ&8B0=@oWuMJEVdB^{WC8^r9g)9k?hk{nP)Fg
ztr#3T0F$$n^50FLv*xr#Nc%%AE%y(Lh_oT8{!GAMN`#=bj2n?QYi-NF9-l+?5Og&i
zU<!;JSO%I$%TXV$Vy_jMpwzK04X!kQ8}J4@>moINV{LkuRPhK|IV*c;r!5irEr0{&
z(Hh|_le2p-a%t&js=Go`>EBjl(W7p>@At{BPLbSw+#Qy(cW`!3H{1dC={xL29G#xV
z&z_`QgzntQzst}h3U&7G!Ou=1)LV2&TC&2d?AW?B*A5j?#Ezck<p=8N0d`hv+F#2-
zWPR-}AIP7Eth*5ybR2cFHS_I`Sna(!Pg?w?D+iSffW}Kll$cwa(9(Y-BmPVgPzkOa
zF36CT3Uxk`|E-^ILl+~Yqhi|rU8^8fYd8g)tD9XE9RsXE|ExJw>6~x%x8?>E`Qc5;
zd0FdC>#21bq6ns+TA~(yq`(8+wlUC(hIA(XZLKmtWhQYQSv)4abED{6ayT;D18pdy
zWpn|3C&%>DyIa2Vyo_z0e<zSHH${jMRp&qd-QmnY^3|1mi%shh$_u{1zFmQR`;zk=
zjcZSM`ZX{ASmm&re>nA@_WH^aJQdDi?k?YvwQJ@xpgstBcX`tQBNRzz+C`1G0Y4Nj
z;bS$1!_x(28~x`!+YAfYfG)(J-H;v?<#2ZO)ph=a;?7@>w2>jz$?9U@Z#ptsg<{w%
zhtJT!uUJsMr|}(MWwAiOzY!sSx?)|1SUahW6g!$y{w~CFW3>OuO4K7Hyf#-18}d?E
zR=BGS;We?jV3=@y3;K63YbiUbs)gnMwRGk2P_1u#4#o_UQP(mQBUg)?l&za(7IQ^i
zYs!+Cx+zI0`!-`1<qC1Lh09DOx&~88lk7Dj%QX>x$(D?@EHP%7VSb0(`TsfZvwXkL
zd(Qd1=lfLkG*$B}sid-I^!`=6vqhDR2Y?GnJ<QfX6^AF^&UTv$t5*BrU-Z7ihga#*
z(JBf_2@T!lbd_cNJ8kN~Q$5CBRBNg1^Lsx%u0UsNDBqYj+sD=XVU*N!rE2?7Wn{3!
zt$+%NV-}mlrjf{?a|CR<=^@a}WL{Anv$6OthPdJR!?`;2`nIZ0!&A-W1P88?UOfC&
zGk|-hft^>pGQ4O1+&4$Nd-dP|%?-IN;7Di<Zu#Pi_8r2i5+}N5<Nqf5X?8+p9bb0}
zhGRe0V-#y(=M<l~=-}Q@+s+SrXXw0u%IGkGE#n4qJgwLKTGuQ~dzbZ1aZw;Cq>fbW
z1#TudEe}PMK$ff1RQv)IIW$Z&$-RAbD=2}tP&3t&4t@*`I;cC|GBD9U;DtH4ff(26
zg@h!d*6k^(fq?&6)c*Yf&8>)tunlwXnaBvy@<~wOU;V+LVfmsSp44rIiK)<Lli=SG
zx(pXjMFt!G%$mA9M}8bSd5A9|pi#5(TjU;Ah)=!D?OI>Ux>m*%ng5kBSJJ*-7D#%@
z$EPQ{OGjl$&AosY`BSDG@>l%4%A4ausI~uv$D+p5I^A9dv}Y4@f1}eK1;6u1)#=(n
z>xl82fdH6Nv@5w^^}K_E36j#*)~Q?8cO-VuSZa$hkr1&a9=|(rqKjaBOMN!ucR>%2
zG`ObI+ENOH*`@cZj`F1QUdSEt5nDfPHk$F?H>$Zs9>GCjzWqmS_tTcHC!yk)&^2*c
zF6q&aMSCHU15&kd*h*!O=Z~+Zw8J5r9de{;L9GcB&{rCJV4-qNd~%wUDbi_$rI7Q|
zQNd@)9kA;(>R4iD<^iXiTzi}U_|m{%II4bYmnLT8uXl$QdH_rnk;HCa2cfm<=7l|^
z-6${r;;<Bt$81Y|`}*NlL?dxR&272#EU*o?K`@4+eiLO2Hr3ixajgLsb1D5_7#D}D
zP*yiB4Jm%_;jFMpu6WU#kt-eM<`G}Vkot`hP2@t2>zr+?5;d+v=1DO$YL)DUq};yE
zf8-XhsD(q6$ZjDdSX!*fIW5UNke2n1Ot)VdX@X!_UGe!lgg`v}J5jf>ZF8wU4x|fi
zauW(p+%h>esEdNH#B9N(_YDDYcc#4WLQS?o?EOFCf&-L>e0w?}Ed(Re1b>;K<SZ}$
zETvJ=Rr=G5x}1+J!s=TxxvYIF#HG*Lh;%V=v)`7M4osgfTJwBFB5P9_`PoV+8ug&=
z`OE4+OxzRy``qcCk?l`DO}fd#CJUrCyO%^_%W}fxr#rux5iYu(;7rul|9!eaV_`{(
zG_{0B*po}+$Y*sM+u`X7H;Yu>xbXS>BYJx6C7uU$OQ9E9!$Ic-wqU#O4o}u&y(;pZ
zHkoWl@^Fu*4-VS?yEtO9AiaT*(dD}7ViTd$R#M8GO4+<nsr;i287e!C{mUJ5h*}^g
z*MSWR<)0jmkz|d}nmpB1Z#VY7_OsEKI0!}t=W|KsS_O9pQvF(x(z#d5^Fp!MX6aSL
zZXaFvitOh4dP0j}k>dUP$Fx;d|D{K+e((MDcy5E*Q|8F=YjY1<Rv{!f)p7uC_k|Wh
z!5!GgePD$e{*zOJxP1nw8@{m}T)z$pK03VhT)a^m(08qCUy!IfV>O03HDCGmKjVMl
zQ%F#;{WbizC#6z<5T4hHlR}tPQ8{k;(JGtf0JzPxspOYmpDa3&mSr*0a>R&De6)d9
z5XXRZKsg<i8o!L|8;7v0ux`+zGHjUlP=At*P4X`sC|)CV9Rrqe{=|Y>LJ^_)rd5Qf
zqitZo5at33Oa;>2CrW6<vQFZUOicMH+8qNTnNki0)OAr>QAtt9*&q|uxIJ*B;wGt-
z7t};+$1kq@_58ViyV5S9Nvi&0P3Wf*k!ZYP6B8(wi4^-t%BCmo(9^k;p_%}ruPev0
z?%%(eD0AVu71(=5?1jnPqv}R!NyZ|uPz5~MWnPe|Yy;h>giCkV01V#1_gBH9&H%4$
z8cn5R1%19nC0#yy^MKU18w#L38zwf*8z*#34C1G!dr150TYMQ^`iso!Z%b|BkbKc*
zIci^T-oxVz;GdZuq|A*5ijl&xWMk>(OL%4FN1wu8mCb{s8rcob-!3KvSE+uz@vFY7
z7FrxF4_gZ(&<`!L`vbK{6H%=JDP)UpfPYH5y9&cgCd>!>Zkvh2&W-}nwG*dLuZGIv
zN#&?*^|BzX4SpBVDv+t3Rqx+_DJ;N9KJM64#|rE5!_ghTR|biiI3kHzWSe+1&-Gj_
z=Ti9u#Ab*n9@OJ9IcTR{kBmbvWnjRS#+kv=(SrI9)s<focK$Dw+#qQJ1r5Gv=9gbd
zjB009pz}@+et)!#9s=);Nui=W$BrVnIW^xNc7XXCVZ#Okl@~h5ANHc86S}WlNS+}_
z^?Z7A!M$S0=jn&bn(M_r^mUcd`TT|cSr~o#{Y6eb{#M7iv6um^*=)nquYcjtrd+=)
zVej$^045Uj^szkGfZCS__;*1n%~95$d)<|MkL_Ag<A3#hX7w}YhBd;d0@xUa#^dbj
zRd?K7wdpE+=+oXFd;asvHyDRQIvC#W$6q=z^=UAn-hxfcT-AYFpJ6DT0ZcEG3-_iU
zSC}4zFwIe~_pES|j8B07q1Iy1q_L~XkER%oInlrZ*!yS0rqvE+i)nIlJZ7_E+}H>b
zi2I&xXfSbKwA$TTs4-Q!wpMWcQz8m}m0pSs=p?&5LZU*YLwYHi+bBz%I)P8%Td>hP
zp0xja?X+O-;fgHGPckGoC))@f7snhv{O#_?zXdrpa~kfZe{g7_?4TjK!A3zVgkH;A
zT3dB<Oz+w~#nykPw17v*7+-&=?A){GdjGcc9+@yE`OI!qrSv)csO2J^bT-E<b|ufK
zhPd**we<$;UMJKPhs&KTa1NFc58aBt=<NJ9y7HLdVQcGMcOzpz18}?sKjC7_4CjfD
zB~0iWmG+gF!H#?O+|Xds-)X8nOL${5rdKD<03k)r4*BFkV?^--b1YlI;}+^Iv^c7N
zn&1_yfARC{$riPr4#xa?C}=G7^XKN8;0CJ(w-U{ermoK;k9#hin;I}>n_0$<&m|;$
zpOlwZwG?ylU1@3r<Hf4bLYe+q_1Ty}9@#0IKMm3L9>~dFx`(tPYAw@{+?GI))2#}f
zkUBqdzdnO0eexE==5c!2j+f-U)Ijpm&xKa8N5c6tm^*ovt4YZ1Ew#MGMS(krjoL~t
zHZ|{%_pW{6<{}%M9TR;22rxOo$Khy(5z}|WpLwzGYuo(xQ-g|jJR$3i%hPjW@BRwn
z#Uf!%GK(_HM_tgi1u(Z=y8QrpZ@XXC$~&IrNnE{|fDaJiRK^`+>6oJ(kX%h?*WKrl
zRP-)9qVov!sJe7Na?0|Ldj``qr8_*!)$zXWTw{8k&$-%VT;dmst?Q{`R%&Wpu&b{x
zC^H$8GVE8SS{H1lWO3Dqr#;`TH|bmA=;_B_(~-d8c9N!OQs$lG84;<nHNufrma-&8
z=+`{2Lo&=bF#qzS<?`d+vqDmumaf3&cy_I_rq@bhX68QuyYEz|sj3;0oW&nG^u;$y
zl01X;!HN;w8d27n;nxK6cbW;HnK`WD=Oe>h+axf<Q>wXu!!N&pA$3B$Hvt8vnQfg#
zHiKGTY&3#N%W=1d6!^{*U3b(Ek0RK{W2Pl|sX}P9*3=M%7z`Z+Cn>2q`V$nFv)V*c
zvmi=WDM%DPf!*#4D~bSi?>%iKb1I8`Nq#&9=-Oo`djXVEzVe2#!i_H!53gTB8Ny;z
zzlwIS63>oiTw1sI^Qxj;+$%cEtTizooI8T(z~+}qyOmm_F2OVH0q+B&NLme2mSQ4T
z<ic>0np~(y-vJ_bEJU`G3&SgOXvAL^W5V6{&ob+Hpelq6j&w!#gRgAsdu!8bz_b?_
z0M8WM49g;$K*L0+yDmr4I{<&g&l!l$!wTic#s#+@K)R@Lgt19IoYQNcxrmX1sJahQ
zgt=@`L{qmFhC__+yUZx>1$13V6G$nytj6PmF|mjB!9-!*71vJfrI^T<TScC_KHvVb
zlL=VK#kw8Cq(l*;8iUik&<rIULIyt?!NmS!-WZ_vWE<sF7PkBdqZ9Do5o6pzwMZ0e
z)$MPTWUnDJu}-fG!)x3X#4Gi@htHK(%QqBmS&%(=HS%K+@H%1R_*;ebdFuZG5BI|w

literal 0
HcmV?d00001

diff --git a/data/icons-64/trader.png b/data/icons-64/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..18bc151b0ae9f6bf9ab9b4ffd8aaffaf0d4714a4
GIT binary patch
literal 4605
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

literal 0
HcmV?d00001

diff --git a/data/icons-96/trader.png b/data/icons-96/trader.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ddd33cc5beec9a6aa521f1341e5efdd4bb424c
GIT binary patch
literal 7835
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

literal 0
HcmV?d00001


From 584682955ff7eb5c3b0bfeef85e4cc27487f04a2 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 19 May 2017 23:54:56 +1000
Subject: [PATCH 47/99] Make sure the icon images are distributed and installed
 correctly

---
 configure.ac     |  1 +
 data/Makefile.am | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 46bd9c5..d7fcbd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [
 ])
 
 AC_SUBST([desktopdir],['${datadir}/applications'])
+AC_SUBST([iconsdir],['${datadir}/icons/hicolor'])
 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 390be57..46072f5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,7 +27,31 @@
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-dist_desktop_DATA = trader.desktop
+dist_desktop_DATA       = trader.desktop
+
+icons16dir              = ${iconsdir}/16x16/apps
+icons22dir              = ${iconsdir}/22x22/apps
+icons24dir              = ${iconsdir}/24x24/apps
+icons32dir              = ${iconsdir}/32x32/apps
+icons48dir              = ${iconsdir}/48x48/apps
+icons64dir              = ${iconsdir}/64x64/apps
+icons96dir              = ${iconsdir}/96x96/apps
+icons128dir             = ${iconsdir}/128x128/apps
+icons256dir             = ${iconsdir}/256x256/apps
+icons512dir             = ${iconsdir}/512x512/apps
+iconsscalabledir        = ${iconsdir}/scalable/apps
+
+dist_icons16_DATA       = icons-16/trader.png
+dist_icons22_DATA       = icons-22/trader.png
+dist_icons24_DATA       = icons-24/trader.png
+dist_icons32_DATA       = icons-32/trader.png
+dist_icons48_DATA       = icons-48/trader.png
+dist_icons64_DATA       = icons-64/trader.png
+dist_icons96_DATA       = icons-96/trader.png
+dist_icons128_DATA      = icons-128/trader.png
+dist_icons256_DATA      = icons-256/trader.png
+dist_icons512_DATA      = icons-512/trader.png
+dist_iconsscalable_DATA = trader.svg
 
 EXTRA_DIST = \
 	README			\

From aa360d2788b3e4aa790fea9ac4ca72c2dece484d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 09:06:00 +1000
Subject: [PATCH 48/99] Enable maintainer mode in configure.ac

Although maintainer mode is the default, explicitly listing in
configure.ac allows users (or distributions, more to the point) of
disabling it by passing "--disable-maintainer-mode" to ./configure.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index d7fcbd4..da79bf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_CONFIG_SRCDIR([src/trader.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.15 -Wall -Werror foreign dist-xz])
+AM_MAINTAINER_MODE([enable])
 AC_CONFIG_LIBOBJ_DIR([lib])
 
 AC_PROG_CC

From e4d884afc9fabfa6ddf2ef1e6a24ab6dfda0db83 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 09:55:20 +1000
Subject: [PATCH 49/99] Replace U+0060 GRAVE ACCENT with U+0027 APOSTROPHE

In the past, GNU tools used quotes `like this'.  Modern practice is to
use quotes 'like this'.  Update Star Traders to follow this newer
standard, including all PO files.
---
 po/da.po     | 30 +++++++++++++++---------------
 po/de.po     | 30 +++++++++++++++---------------
 po/en_AU.po  | 30 +++++++++++++++---------------
 po/en_CA.po  | 30 +++++++++++++++---------------
 po/en_GB.po  | 30 +++++++++++++++---------------
 po/en_US.po  | 30 +++++++++++++++---------------
 po/eo.po     | 30 +++++++++++++++---------------
 po/fi.po     | 30 +++++++++++++++---------------
 po/fr.po     | 30 +++++++++++++++---------------
 po/hr.po     | 30 +++++++++++++++---------------
 po/hu.po     | 30 +++++++++++++++---------------
 po/nb.po     | 30 +++++++++++++++---------------
 po/ru.po     | 30 +++++++++++++++---------------
 po/sr.po     | 30 +++++++++++++++---------------
 po/sv.po     | 30 +++++++++++++++---------------
 src/fileio.c |  4 ++--
 src/intf.c   | 10 +++++-----
 src/trader.c | 10 +++++-----
 src/utils.c  |  4 ++--
 19 files changed, 239 insertions(+), 239 deletions(-)

diff --git a/po/da.po b/po/da.po
index d0ef3ec..5e403c6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:01+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:48+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ugyldig værdi for --max-turn: »%s«\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ugyldig operand »%s«\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ugyldigt spilnummer »%s«\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: ekstra operand »%s«\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -94,7 +94,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prøv »%s --help« for yderligere information.\n"
 
 #: src/trader.c:311
@@ -1151,12 +1151,12 @@ msgstr "%s: ugyldigt felt på linje %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ugyldigt felt på linje %d: »%s«"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ugyldigt felt på linje %d: »%s«"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1592,12 +1592,12 @@ msgstr "[ Tryk <MELLEMRUM> for at fortsætte eller <←> for den forrige side ]
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: streng har ikke korrekt format: »%s«"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tegn har ugyldig bredde: »%lc«"
 
 #: src/intf.c:434
@@ -1612,7 +1612,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: »%s«"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1627,7 +1627,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ugyldigt tegn i streng: »%ls«"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1673,7 +1673,7 @@ msgstr "ikke nok hukommelse"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: »%s«"
 
 #: src/utils.c:1081
@@ -1683,7 +1683,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: »%lc«"
 
 #: lib/getopt.c:278
diff --git a/po/de.po b/po/de.po
index 2abf09e..e9821dc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:06+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:48+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ungültiger Wert für --max-turn: „%s“\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ungültiger Operand „%s“\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ungültige Spielnummer „%s“\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: zusätzlicher Operand „%s“\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -95,7 +95,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Versuchen Sie „%s --help“ für ausführlichere Informationen.\n"
 
 #: src/trader.c:311
@@ -1154,12 +1154,12 @@ msgstr "%s: unzulässiges Feld in Zeile %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: unzulässiges Feld in Zeile %d: „%s“"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: unzulässiger Wert in Zeile %d: „%s“"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1593,12 +1593,12 @@ msgstr "[ <LEERTASTE> für nächste, <RÜCKSCHRITT> für vorherige Seite ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: Die Zeichenkette hat ein falsches Format: „%s“"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: Das Zeichen hat eine unzulässige Breite: „%lc“"
 
 #: src/intf.c:434
@@ -1613,7 +1613,7 @@ msgstr "mkchstr_conv: NULL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s“"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1628,7 +1628,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: unzulässiges Zeichen in Zeichenkette „%ls“"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1674,7 +1674,7 @@ msgstr "Kein frier Speicer mehr vorhanden"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s“"
 
 #: src/utils.c:1081
@@ -1684,7 +1684,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc“"
 
 #: lib/getopt.c:278
diff --git a/po/en_AU.po b/po/en_AU.po
index 8ebfdb4..ddf9936 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 09:57+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:49+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -1141,12 +1141,12 @@ msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1578,12 +1578,12 @@ msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1598,7 +1598,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1613,7 +1613,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1659,7 +1659,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1669,7 +1669,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
 #: lib/getopt.c:278
diff --git a/po/en_CA.po b/po/en_CA.po
index 5b5c771..3ef64a3 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 09:59+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:49+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -1141,12 +1141,12 @@ msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1578,12 +1578,12 @@ msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1598,7 +1598,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1613,7 +1613,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1659,7 +1659,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1669,7 +1669,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
 #: lib/getopt.c:278
diff --git a/po/en_GB.po b/po/en_GB.po
index f608ae2..fc1c171 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:00+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:49+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -1141,12 +1141,12 @@ msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1578,12 +1578,12 @@ msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1598,7 +1598,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1613,7 +1613,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1659,7 +1659,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1669,7 +1669,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
 #: lib/getopt.c:278
diff --git a/po/en_US.po b/po/en_US.po
index dc497c4..5101528 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 09:55+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:49+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -1141,12 +1141,12 @@ msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1578,12 +1578,12 @@ msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1598,7 +1598,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1613,7 +1613,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1659,7 +1659,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1669,7 +1669,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
 #: lib/getopt.c:278
diff --git a/po/eo.po b/po/eo.po
index ba0794b..559ed4d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:07+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -44,22 +44,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: malvalida valoro por --max-turn: '%s'\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: malvalida argumento '%s'\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: malvalida seanc-numero '%s'\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: troa argumento: '%s'\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -95,7 +95,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Provu '%s --help' por pli da informoj.\n"
 
 #: src/trader.c:311
@@ -1147,12 +1147,12 @@ msgstr "%s: malpermesata kampo en linio %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: malpermesata kampo en linio %d: '%s'"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: malpermesata valoro en linio %d: '%s'"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1584,12 +1584,12 @@ msgstr "[ Premu <SPACOn> por daŭrigi aŭ <RETROPAŜOn> por la antaŭa paĝo ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: ĉeno havas malĝustan formon: '%s'"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: signo havas malpermesatan larĝon: '%lc'"
 
 #: src/intf.c:434
@@ -1604,7 +1604,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: '%s'"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1619,7 +1619,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: malpermesata signo en ĉeno: '%ls'"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1665,7 +1665,7 @@ msgstr "memoro plenpleniĝas"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: '%s'"
 
 #: src/utils.c:1081
@@ -1675,7 +1675,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: '%lc'"
 
 #: lib/getopt.c:278
diff --git a/po/fi.po b/po/fi.po
index 7635459..630c160 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:08+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -44,22 +44,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: virheellinen arvo valitsimelle --max-turn: ”%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: virheellinen operandi ”%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: virheellinen pelinumero ”%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: ylimääräinen operandi ”%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -94,7 +94,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Lisätietoja saa komennolla ”%s --help”.\n"
 
 #: src/trader.c:311
@@ -1151,12 +1151,12 @@ msgstr "%s: virheellinen kenttä rivillä %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: virheellinen kenttä rivillä %d: ”%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: virheellinen arvo rivillä %d: ”%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1588,12 +1588,12 @@ msgstr "[ Paina <VÄLILYÖNTIÄ> jatkaaksesi tai <←> siirtyäksesi edelliselle
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: merkkijonolla on väärä muoto: ”%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: merkillä on väärä leveys: ”%lc”"
 
 #: src/intf.c:434
@@ -1608,7 +1608,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ”%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1623,7 +1623,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: virheellinen merkki merkkijonossa: ”%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1669,7 +1669,7 @@ msgstr "muisti loppui"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ”%s”"
 
 #: src/utils.c:1081
@@ -1679,7 +1679,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ”%lc”"
 
 #: lib/getopt.c:278
diff --git a/po/fr.po b/po/fr.po
index 4d6eb36..633cb6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:09+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -50,22 +50,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: opérande invalide « %s »\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: numéro de jeu invalide « %s »\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: opérande surnuméraire « %s »\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -102,7 +102,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
 
 #: src/trader.c:311
@@ -1154,12 +1154,12 @@ msgstr "%s: champ illégal à la ligne %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: champ illégal à la ligne %d: « %s »"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: valeur illégale à la ligne %d: « %s »"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1603,12 +1603,12 @@ msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: la chaîne a un format incorrect: « %s »"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: caractère avec une largeur illégale: « %lc »"
 
 #: src/intf.c:434
@@ -1623,7 +1623,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: « %s »"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1638,7 +1638,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1684,7 +1684,7 @@ msgstr "pas assez de mémoire"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: « %s »"
 
 #: src/utils.c:1081
@@ -1694,7 +1694,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: « %lc »"
 
 #: lib/getopt.c:278
diff --git a/po/hr.po b/po/hr.po
index fa75585..9822f81 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:10+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: neispravna vrijednost za --max-turn: „%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: neispravan operand „%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: neispravan broj igre „%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: operand viška „%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Pokušajte „%s --help” za više informacija.\n"
 
 #: src/trader.c:311
@@ -1151,12 +1151,12 @@ msgstr "%s: nedozvoljeno polje u retku %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: nedozvoljeno polje u retku %d: „%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: nedozvoljena vrijednost u retku %d: „%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1588,12 +1588,12 @@ msgstr "[ Pritisnite <RAZMAKNICU> za nastavak ili <BACKSPACE> za povratak ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: niz znakova ima nepravilan oblik: „%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: znak ima nedozvoljenu širinu: „%lc”"
 
 #: src/intf.c:434
@@ -1608,7 +1608,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1623,7 +1623,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: nedozvoljen znak u nizu: „%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1669,7 +1669,7 @@ msgstr "nema dovoljno memorije"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s”"
 
 #: src/utils.c:1081
@@ -1679,7 +1679,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc”"
 
 #: lib/getopt.c:278
diff --git a/po/hu.po b/po/hu.po
index 5e44a22..d4a0557 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:11+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: érvénytelen érték a --max-turn kapcsolóhoz: „%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: érvénytelen operandus: „%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: érvénytelen játékszám: „%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operandus: „%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -95,7 +95,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: További információkért próbálja a(z) „%s --help” parancsot.\n"
 
 #: src/trader.c:311
@@ -1144,12 +1144,12 @@ msgstr "%s: szabálytalan mező a(z) %d. sorban"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: szabálytalan mező a(z) %d. sorban: „%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: szabálytalan érték a(z) %d. sorban: „%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1582,12 +1582,12 @@ msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz vagy <BACKSPACE>-t az előző
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: a szövegnek helytelen formátuma van: „%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: a karakternek szabálytalan szélessége van: „%lc”"
 
 #: src/intf.c:434
@@ -1602,7 +1602,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1617,7 +1617,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: érvénytelen karakter a szövegben: „%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1663,7 +1663,7 @@ msgstr "nincs elég memória"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s”"
 
 #: src/utils.c:1081
@@ -1673,7 +1673,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc”"
 
 #: lib/getopt.c:278
diff --git a/po/nb.po b/po/nb.po
index 60868da..6327b37 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:12+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ugyldig verdi for --max-turn: «%s»\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ugyldig operand «%s»\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ugyldig spillnummer «%s»\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: ekstra operand «%s»\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -94,7 +94,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prøv «%s --help» for mer informasjon.\n"
 
 #: src/trader.c:311
@@ -1146,12 +1146,12 @@ msgstr "%s: ulovlig felt på linje %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ugyldig felt på linje %d: «%s»"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ugyldig verdi på linje %d: «%s»"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1583,12 +1583,12 @@ msgstr "[ Trykk <MELLOMROM> for å fortsette eller <BACKSPACE> for forrige side
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: streng har feil format: «%s»"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tegn har ugyldig bredde: «%lc»"
 
 #: src/intf.c:434
@@ -1603,7 +1603,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: «%s»"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1618,7 +1618,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ugyldig tegn i streng: «%ls»"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1664,7 +1664,7 @@ msgstr "ikke mer minne"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: «%s»"
 
 #: src/utils.c:1081
@@ -1674,7 +1674,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: «%lc»"
 
 #: lib/getopt.c:278
diff --git a/po/ru.po b/po/ru.po
index e14746c..1172cb4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:13+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -46,22 +46,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: неверное значение аргумента для --maxturn: «%s»\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: неверный аргумент «%s»\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: неверный номер игры «%s»\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: лишний аргумент «%s»\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -97,7 +97,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Попробуйте «%s --help» для получения более подробного описания.\n"
 
 #: src/trader.c:311
@@ -1157,12 +1157,12 @@ msgstr "%s: неверное поле в строке %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: неверное поле в строке %d: «%s»"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: неверное значение в строке %d: «%s»"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1594,12 +1594,12 @@ msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> —
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: строка имеет неверный формат: «%s»"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: символ имеет неверную ширину: «%lc»"
 
 #: src/intf.c:434
@@ -1614,7 +1614,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: «%s»"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1629,7 +1629,7 @@ msgstr "=?*\\/"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: неверный символ в строке: «%ls»"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1675,7 +1675,7 @@ msgstr "недостаточно памяти"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: «%s»"
 
 #: src/utils.c:1081
@@ -1685,7 +1685,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: «%lc»"
 
 #: lib/getopt.c:278
diff --git a/po/sr.po b/po/sr.po
index 9873941..9ff007b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:13+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -44,22 +44,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: неисправна вредност за „--max-turn“: „%s“\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: неисправан операнд „%s“\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: неисправан број игре „%s“\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: додатни операнд „%s“\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -94,7 +94,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Пробајте „%s --help“ за више података.\n"
 
 #: src/trader.c:311
@@ -1148,12 +1148,12 @@ msgstr "%s: недозвољено поље у %d. реду"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: недозвољено поље у %d. реду: „%s“"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: недозвољена вредност у %d. реду: „%s“"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1585,12 +1585,12 @@ msgstr "[ Притисните <РАЗМАК> да наставите или <П
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: ниска је у погрешном запису: „%s“"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: знак је недозвољене ширине: „%lc“"
 
 #: src/intf.c:434
@@ -1605,7 +1605,7 @@ msgstr "mkchstr_conv: НИШТА"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s“"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1620,7 +1620,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: недозвољени знак у нисци: „%ls“"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1666,7 +1666,7 @@ msgstr "нема више меморије"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s“"
 
 #: src/utils.c:1081
@@ -1676,7 +1676,7 @@ msgstr "xwcrtomb: НИШТА"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc“"
 
 #: lib/getopt.c:278
diff --git a/po/sv.po b/po/sv.po
index b8e7821..0feecf4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-17 09:45+1000\n"
-"PO-Revision-Date: 2017-05-17 10:14+1000\n"
+"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -43,22 +43,22 @@ msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ogiltigt värde för --max-turn: ”%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ogiltig operand ”%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ogiltigt spelnummer ”%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ”%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prova ”%s --help” för mer information.\n"
 
 #: src/trader.c:311
@@ -1150,12 +1150,12 @@ msgstr "%s: ogiltigt fält på rad %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ogiltigt fält på rad %d: ”%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ogiltigt värde på rad %d: ”%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1588,12 +1588,12 @@ msgstr "[ Tryck <RETUR> för att fortsätta eller <BACKSTEG> för föregående s
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: sträng har felaktigt format: ”%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tecken har ogiltig bredd: ”%lc”"
 
 #: src/intf.c:434
@@ -1608,7 +1608,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ”%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1623,7 +1623,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ogiltigt tecken i sträng: ”%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1669,7 +1669,7 @@ msgstr "slut på minne"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ”%s”"
 
 #: src/utils.c:1081
@@ -1679,7 +1679,7 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ”%lc”"
 
 #: lib/getopt.c:278
diff --git a/src/fileio.c b/src/fileio.c
index 2dec4b6..bf1c67e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -48,11 +48,11 @@
 		     filename, lineno);					\
 	}								\
 	if (sscanf(buf, _fmt "\n", &(_var)) != 1) {			\
-	    err_exit(_("%s: illegal field on line %d: `%s'"),		\
+	    err_exit(_("%s: illegal field on line %d: '%s'"),		\
 		     filename, lineno, buf);				\
 	}								\
 	if (! (_cond)) {						\
-	    err_exit(_("%s: illegal value on line %d: `%s'"),		\
+	    err_exit(_("%s: illegal value on line %d: '%s'"),		\
 		     filename, lineno, buf);				\
 	}								\
 	lineno++;							\
diff --git a/src/intf.c b/src/intf.c
index 9a09a37..d8c58f4 100644
--- a/src/intf.c
+++ b/src/intf.c
@@ -107,7 +107,7 @@ typedef struct txwin {
 	char *s = gettext(_default);					\
 	if (xmbstowcs(buf, s, BUFSIZE) < (_checkpos) + 1		\
 	    || buf[_checkpos] != L'|') {				\
-	    err_exit(_("%s: string has incorrect format: `%s'"),	\
+	    err_exit(_("%s: string has incorrect format: '%s'"),	\
 		     __stringify(_var), s);				\
 	}								\
 	(_var) = xwcsdup(buf);						\
@@ -123,7 +123,7 @@ typedef struct txwin {
 									\
 	c = (_var);							\
 	if ((w = wcwidth(c)) < 1) {					\
-	    err_exit(_("%s: character has illegal width: `%lc'"),	\
+	    err_exit(_("%s: character has illegal width: '%lc'"),	\
 		     __stringify(_err), (wint_t) c);			\
 	}								\
 									\
@@ -1565,7 +1565,7 @@ error:
     free(orig_outbuf);
     errno = saved_errno;
 
-    errno_exit(_("mkchstr: `%s'"), format);
+    errno_exit(_("mkchstr: '%s'"), format);
 }
 
 
@@ -2031,7 +2031,7 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize,
     clen = wcswidth(buf, bufsize);	// clen is number of column positions
 
     if (clen < 0) {
-	err_exit(_("gettxline: illegal character in string: `%ls'"), buf);
+	err_exit(_("gettxline: illegal character in string: '%ls'"), buf);
     }
 
     /* Find the point from which buf should be displayed to screen.  cpos
@@ -2076,7 +2076,7 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize,
 		clen = wcswidth(buf, bufsize);
 
 		if (clen == -1) {
-		    err_exit(_("gettxline: illegal character in string: `%ls'"),
+		    err_exit(_("gettxline: illegal character in string: '%ls'"),
 			     buf);
 		}
 
diff --git a/src/trader.c b/src/trader.c
index 8f6fad9..0d6d43d 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -232,7 +232,7 @@ void process_cmdline (int argc, char *argv[])
 		option_max_turn = strtol(optarg, &p, 10);
 
 		if (option_max_turn < MIN_MAX_TURN || p == NULL || *p != '\0') {
-		    fprintf(stderr, _("%s: invalid value for --max-turn: `%s'\n"),
+		    fprintf(stderr, _("%s: invalid value for --max-turn: '%s'\n"),
 			    program_name, optarg);
 		    show_usage(EXIT_FAILURE);
 		}
@@ -248,7 +248,7 @@ void process_cmdline (int argc, char *argv[])
 
     if (optind < argc && argv[optind] != NULL) {
 	if (*argv[optind] == '-') {
-	    fprintf(stderr, _("%s: invalid operand `%s'\n"),
+	    fprintf(stderr, _("%s: invalid operand '%s'\n"),
 		    program_name, argv[optind]);
 	    show_usage(EXIT_FAILURE);
 	}
@@ -257,7 +257,7 @@ void process_cmdline (int argc, char *argv[])
 	    && *argv[optind] >= '1' && *argv[optind] <= '9') {
 	    game_num = *argv[optind] - '0';
 	} else {
-	    fprintf(stderr, _("%s: invalid game number `%s'\n"),
+	    fprintf(stderr, _("%s: invalid game number '%s'\n"),
 		    program_name, argv[optind]);
 	    show_usage(EXIT_FAILURE);
 	}
@@ -266,7 +266,7 @@ void process_cmdline (int argc, char *argv[])
     }
 
     if (optind < argc && argv[optind] != NULL) {
-	fprintf(stderr, _("%s: extra operand `%s'\n"),
+	fprintf(stderr, _("%s: extra operand '%s'\n"),
 		program_name, argv[optind]);
 	show_usage(EXIT_FAILURE);
     }
@@ -305,7 +305,7 @@ NO WARRANTY, to the extent permitted by law; see the License for details.\n\
 void show_usage (int status)
 {
     if (status != EXIT_SUCCESS) {
-	fprintf(stderr, _("%s: Try `%s --help' for more information.\n"),
+	fprintf(stderr, _("%s: Try '%s --help' for more information.\n"),
 		program_name, program_name);
     } else {
 	printf(_("Usage: %s [OPTION ...] [GAME]\n"), program_name);
diff --git a/src/utils.c b/src/utils.c
index 5e39947..6d160b0 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1038,7 +1038,7 @@ size_t xmbstowcs (wchar_t *restrict dest, const char *restrict src, size_t len)
 		// Illegal sequence detected: replace it and try again
 		*p = EILSEQ_REPL;
 	    } else {
-		errno_exit(_("xmbstowcs: `%s'"), src);
+		errno_exit(_("xmbstowcs: '%s'"), src);
 	    }
 	} else if (p != NULL) {
 	    // Multibyte string was too long: truncate dest
@@ -1083,7 +1083,7 @@ size_t xwcrtomb (char *restrict dest, wchar_t wc, mbstate_t *restrict mbstate)
 	    dest[n] = EILSEQ_REPL;
 	    dest[n++] = '\0';
 	} else {
-	    errno_exit(_("xwcrtomb: `%lc'"), (wint_t) wc);
+	    errno_exit(_("xwcrtomb: '%lc'"), (wint_t) wc);
 	}
     }
 

From 14be4cfc6fce328313e9b7f7652e2fefb979de37 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 09:58:38 +1000
Subject: [PATCH 50/99] Replace the letter "x" with U+00D7 MULTIPLICATION SIGN
 where appropriate

---
 po/fi.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 630c160..0d62091 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:50+1000\n"
+"PO-Revision-Date: 2017-05-20 09:57+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -1354,7 +1354,7 @@ msgstr ""
 "Pelaajat  voivat myös  lainata  Tähtienvälisestä Kauppapankista  lisäostojen\n"
 "rahoittamiseksi osakepörssissä.\n"
 "\n"
-"Rasteri ^B~x^N x ^B~y^N edustaa galaksikarttaa.  Sen tyypillinen lohko voi olla:\n"
+"Rasteri ^B~x^N × ^B~y^N edustaa galaksikarttaa.  Sen tyypillinen lohko voi olla:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
 "        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N edustaa ^Btyhjää avaruutta^N,\n"

From 8e5ef90932de0060c0e8d71feff9e64965348462 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 10:10:56 +1000
Subject: [PATCH 51/99] Replace "--" with U+2014 EM DASH as appropriate

---
 po/de.po    | 4 ++--
 po/en_AU.po | 4 ++--
 po/en_CA.po | 4 ++--
 po/en_GB.po | 4 ++--
 po/en_US.po | 4 ++--
 po/eo.po    | 8 ++++----
 po/fi.po    | 8 ++++----
 po/hr.po    | 8 ++++----
 po/sv.po    | 4 ++--
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/po/de.po b/po/de.po
index e9821dc..a10b217 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:48+1000\n"
+"PO-Revision-Date: 2017-05-20 10:03+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -1527,7 +1527,7 @@ msgstr ""
 "Wenn Sie Ihren Zug gewählt haben, betreten Sie die ^BInterstellare Börse^N. Hier\n"
 "können Sie Aktien kaufen oder  verkaufen, sich von der Handelsbank Geld lei-\n"
 "hen  oder einen Teil  ihrer Schulden  (so vorhanden)  zurückzahlen. Beachten\n"
-"Sie, daß jede  Firma eine beschränkte Zahl von Aktien  ausgibt -- Sie können\n"
+"Sie, daß jede  Firma eine  beschränkte Zahl von Aktien  ausgibt — Sie können\n"
 "nicht endlos kaufen! Sie können aber die  Firma  bitten, weitere Aktien aus-\n"
 "zugeben. Je größer ihr Anteil an  der Firma, desdo höher die Chance, das dem\n"
 "statt gegeben wird.\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index ddf9936..93eddba 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:49+1000\n"
+"PO-Revision-Date: 2017-05-20 09:59+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
@@ -1513,7 +1513,7 @@ msgstr ""
 "Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
 "you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
 "some of your debt (if applicable).  Note that each company  issues a limited\n"
-"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"number of shares — you cannot go on  buying for ever!  You may, however, bid\n"
 "for more shares to be issued.  You have a better chance of succeeding if you\n"
 "own a larger proportion of the company.\n"
 "\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 3ef64a3..90c1a6a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:49+1000\n"
+"PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
@@ -1513,7 +1513,7 @@ msgstr ""
 "Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
 "you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
 "some of your debt (if applicable).  Note that each company  issues a limited\n"
-"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"number of shares — you cannot go on  buying for ever!  You may, however, bid\n"
 "for more shares to be issued.  You have a better chance of succeeding if you\n"
 "own a larger proportion of the company.\n"
 "\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index fc1c171..3084b0f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:49+1000\n"
+"PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
@@ -1513,7 +1513,7 @@ msgstr ""
 "Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
 "you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
 "some of your debt (if applicable).  Note that each company  issues a limited\n"
-"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"number of shares — you cannot go on  buying for ever!  You may, however, bid\n"
 "for more shares to be issued.  You have a better chance of succeeding if you\n"
 "own a larger proportion of the company.\n"
 "\n"
diff --git a/po/en_US.po b/po/en_US.po
index 5101528..1cda747 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:49+1000\n"
+"PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -1513,7 +1513,7 @@ msgstr ""
 "Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
 "you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
 "some of your debt (if applicable).  Note that each company  issues a limited\n"
-"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"number of shares — you cannot go on  buying for ever!  You may, however, bid\n"
 "for more shares to be issued.  You have a better chance of succeeding if you\n"
 "own a larger proportion of the company.\n"
 "\n"
diff --git a/po/eo.po b/po/eo.po
index 559ed4d..10341c7 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:50+1000\n"
+"PO-Revision-Date: 2017-05-20 10:04+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -1519,9 +1519,9 @@ msgstr ""
 "Tuj post  kiam vi  elektas  vian movon,  vi eniras la  ^BInterstelaran  akcian\n"
 "interŝanĝejon^N.  Tie vi  povas aĉeti akciojn,  vendi ilin,  pruntepreni el la\n"
 "Komerca Banko  aŭ repagi  iom el via ŝuldo  (se ekzistanta).  Rimarku ke ĉiu\n"
-"kompanio  disponigas limigitan  nombron da akcioj -- vi ne  povas aĉeti sen-\n"
-"fine!  Tamen, vi povas  peti ke pli da akcioj  estu vendataj.  Vi pli ŝancas\n"
-"sukcesi se vi posedas pli grandan proporcion de la kompanio.\n"
+"kompanio disponigas limigitan nombron da akcioj — vi ne povas aĉeti senfine!\n"
+"Tamen, vi povas  peti ke pli da akcioj estu vendataj.  Vi pli ŝancas sukcesi\n"
+"se vi posedas pli grandan proporcion de la kompanio.\n"
 "\n"
 "La ludo  ordinare finas  post ^B~t^N cikloj.  Tamen, vi povas fini  la ludon pli\n"
 "frue premante  ^K<CTRL><C>^N  kiam aldemandita elekti movon.  Krome,  individuaj\n"
diff --git a/po/fi.po b/po/fi.po
index 0d62091..c5680e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:57+1000\n"
+"PO-Revision-Date: 2017-05-20 10:06+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -1523,9 +1523,9 @@ msgstr ""
 "Heti kun valitset siirtosi,  siirryt ^BTähtien väliseen osakepörssiin^N.  Täällä\n"
 "voit ostaa osakkeita, myydä  niitä, lainata Kauppapankilta tai maksaa joita-\n"
 "kin velkojasi (jos  sellaisia on).  Huomaa, että jokainen  yritys myy rajoi-\n"
-"tetun määrän  osakkeita -- et voi jatka  ostamista  loputtomiin!   Voit kui-\n"
-"tenkin pyytää  lisää osakkeita myytäväksi.  Sinulla  on paremmat onnistumis-\n"
-"mahdollisuudet, jos omistat laajemman osuuden yrityksestä.\n"
+"tetun määrän osakkeita — et voi jatka ostamista loputtomiin!  Voit kuitenkin\n"
+"pyytää lisää osakkeita myytäväksi.   Sinulla on paremmat onnistumismahdolli-\n"
+"suudet, jos omistat laajemman osuuden yrityksestä.\n"
 "\n"
 "Peli  tavallisesti loppuu  ^B~t^N kierroksen  jälkeen.  Voit  kuitenkin lopettaa\n"
 "pelin  aikaisemmin  painamalla ^K<CTRL><C>^N,  kun  sinua pyydetään  valitsemaan\n"
diff --git a/po/hr.po b/po/hr.po
index 9822f81..b7891af 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:50+1000\n"
+"PO-Revision-Date: 2017-05-20 10:07+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -1523,9 +1523,9 @@ msgstr ""
 "Kada  odaberete svoj  potez, ulazite  u  ^BMeđuzvjezdanu burzu^N.   Ovdje možete\n"
 "kupovati  dionice,  prodavati ih, posuđivati  novce od  Trgovačke  banke ili\n"
 "otplatiti dio vašeg duga  (ako postoji).  Primijetite da svaka tvrtka izdaje\n"
-"ograničen  broj dionica  --  ne možete  kupovati  cijelo vrijeme!   Međutim,\n"
-"možete tražiti od  tvrtke izdavanje novih dionica.  Ako  imate veću količinu\n"
-"udjela u tvrtci, veće su vam šanse za uspjeh.\n"
+"ograničen broj dionica — ne možete kupovati cijelo vrijeme!  Međutim, možete\n"
+"tražiti od tvrtke izdavanje novih dionica.  Ako imate veću količinu udjela u\n"
+"tvrtci, veće su vam šanse za uspjeh.\n"
 "\n"
 "Igra uobičajeno  završava nakon ^B~t^N poteza.  Međutim,  možete završiti ranije\n"
 "pritiskom  ^K<CTRL><C>^N  umjesto odabira poteza.  Također pojedini  igrači mogu\n"
diff --git a/po/sv.po b/po/sv.po
index 0feecf4..4613a8c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 09:41+1000\n"
-"PO-Revision-Date: 2017-05-20 09:51+1000\n"
+"PO-Revision-Date: 2017-05-20 10:09+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1522,7 +1522,7 @@ msgstr ""
 "När du valt ditt drag går du in i ^BInterstellära aktiemarknaden^N.   Här kan du\n"
 "köpa aktier, sälja dem,  låna från handelsbanken eller betala tillbaka delar\n"
 "av din skuld  (om du har någon).  Notera att varje  företag utfärdar ett be-\n"
-"gränsat antal aktier -- du kan inte köpa  för alltid!  Du kan dock be om ut-\n"
+"gränsat antal aktier — du kan inte köpa  för alltid!  Du kan dock  be om ut-\n"
 "färdande av mer aktier.  Du har större chans att lyckas om du äger en större\n"
 "del av företaget.\n"
 "\n"

From f7e640c221971eb65082e326a6f674fbd4737489 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 11:48:33 +1000
Subject: [PATCH 52/99] Document the migration from Subversion to Git

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 05b7a63..1523155 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,10 @@ pages, this is page N".  All translations have been updated as a result.
 
 Added the Serbian translation, with thanks to Мирослав Николић.
 
+Migrated the source code repository  from Subversion  to Git.  Updated the
+documentation to suit,  and also listed  specific required version numbers
+for the Autoconf and Automake tools.
+
 
 Version 7.9 (5th January, 2016)
 -------------------------------

From bae66c8f5c4b69026f962522b36f82a334d3a096 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 11:51:13 +1000
Subject: [PATCH 53/99] Mention the newer version of lib/getopt.c that has
 different strings in it

---
 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1523155..d69df28 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,8 @@ Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
 string starts or  ends with a new-line character,  its translation must do
 so as well.  This has an impact on labels in particular.  Also changed the
 help text string  "Page N of M"  to allow  translations of the form  "Of M
-pages, this is page N".  All translations have been updated as a result.
+pages, this is page N".  In addition,  newer versions of lib/getopt.c have
+different strings.  All translations have been updated as a result.
 
 Added the Serbian translation, with thanks to Мирослав Николић.
 

From 2715a602ee92a4c3168a589bfbb6eadf623d12ad Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 12:25:51 +1000
Subject: [PATCH 54/99] Set the version number to 7.10-pre1 to allow a
 prerelease

---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index da79bf9..57d1861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/])
+AC_INIT([Star Traders], [7.10-pre1], [J.Zaitseff@zap.org.au], [trader],
+        [http://www.zap.org.au/software/trader/])
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
 AC_PREREQ([2.69])

From 90c54b4b7397afdc0b4e0aa8d375f7daf9d659a4 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 12:30:28 +1000
Subject: [PATCH 55/99] Update all PO files as part of "make dist"

---
 po/da.po    | 2 +-
 po/de.po    | 2 +-
 po/en_AU.po | 2 +-
 po/en_CA.po | 2 +-
 po/en_GB.po | 2 +-
 po/en_US.po | 2 +-
 po/eo.po    | 2 +-
 po/fi.po    | 2 +-
 po/fr.po    | 2 +-
 po/hr.po    | 2 +-
 po/hu.po    | 2 +-
 po/nb.po    | 2 +-
 po/ru.po    | 2 +-
 po/sr.po    | 2 +-
 po/sv.po    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/da.po b/po/da.po
index 5e403c6..70cc5a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:48+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.po b/po/de.po
index a10b217..5de12fc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:03+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index 93eddba..15eccb2 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:59+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 90c1a6a..d66c136 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3084b0f..9f675c0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
diff --git a/po/en_US.po b/po/en_US.po
index 1cda747..314cc04 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
diff --git a/po/eo.po b/po/eo.po
index 10341c7..9eae679 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:04+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/fi.po b/po/fi.po
index c5680e4..fe3ac10 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:06+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.po b/po/fr.po
index 633cb6f..2aea89a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/po/hr.po b/po/hr.po
index b7891af..ad427b8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:07+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
diff --git a/po/hu.po b/po/hu.po
index d4a0557..ee0e749 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/nb.po b/po/nb.po
index 6327b37..ca34053 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/po/ru.po b/po/ru.po
index 1172cb4..e352cc4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/po/sr.po b/po/sr.po
index 9ff007b..7652d8c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
diff --git a/po/sv.po b/po/sv.po
index 4613a8c..052175c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 09:41+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
 "PO-Revision-Date: 2017-05-20 10:09+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

From 304269717c88d18652bd94314a855715d76f6cac Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 13:35:14 +1000
Subject: [PATCH 56/99] Update all auto-generated files

These files have been created by running ./build-aux/bootstrap with
Gnulib as at commit 5e0faf88718e9329e44c773039166c7dbf3ca57c (with a date
stamp of Fri May 19 19:27:51 2017 +0200), Autoconf 2.69, Automake 1.15 and
Gettext 0.19.8.1.
---
 Makefile.in                |  111 ++-
 aclocal.m4                 |  376 +++++--
 build-aux/config.guess     |  137 +--
 build-aux/config.rpath     |    2 +-
 build-aux/config.sub       |   38 +-
 config.h.in                |   95 +-
 configure                  | 1903 ++++++++++++++++++++++++++----------
 data/Makefile.in           | 1528 +++++++++++++++++++++++++++++
 doc/Makefile.in            |   85 +-
 lib/Makefile.am            |  184 ++--
 lib/Makefile.in            |  297 +++---
 lib/_Noreturn.h            |   10 +
 lib/btowc.c                |    2 +-
 lib/c-ctype.h              |   22 +-
 lib/c-strcase.h            |    2 +-
 lib/c-strcasecmp.c         |    2 +-
 lib/c-strncasecmp.c        |    2 +-
 lib/config.charset         |    2 +-
 lib/crc.c                  |    2 +-
 lib/crc.h                  |    2 +-
 lib/getopt-cdefs.in.h      |   67 ++
 lib/getopt-core.h          |   96 ++
 lib/getopt-ext.h           |   77 ++
 lib/getopt-pfx-core.h      |   54 +
 lib/getopt-pfx-ext.h       |   66 ++
 lib/getopt.c               | 1436 +++++++++------------------
 lib/getopt.in.h            |  242 +----
 lib/getopt1.c              |  165 ++--
 lib/getopt_int.h           |   91 +-
 lib/gettext.h              |   15 +-
 lib/gettimeofday.c         |  156 ++-
 lib/hard-locale.c          |   72 ++
 lib/hard-locale.h          |   25 +
 lib/iconv.c                |    2 +-
 lib/iconv.in.h             |    2 +-
 lib/iconv_close.c          |    2 +-
 lib/iconv_open.c           |    2 +-
 lib/limits.in.h            |   74 ++
 lib/localcharset.c         |   12 +-
 lib/localcharset.h         |    2 +-
 lib/locale.in.h            |    2 +-
 lib/localtime-buffer.c     |   58 ++
 lib/localtime-buffer.h     |   27 +
 lib/mbrtowc.c              |   69 +-
 lib/mbsinit.c              |   36 +-
 lib/mbsrtowcs-impl.h       |    2 +-
 lib/mbsrtowcs-state.c      |    2 +-
 lib/mbsrtowcs.c            |    2 +-
 lib/mbtowc-impl.h          |    2 +-
 lib/mbtowc.c               |    2 +-
 lib/memchr.c               |    2 +-
 lib/ref-add.sin            |    2 +-
 lib/ref-del.sin            |    2 +-
 lib/stdbool.in.h           |    2 +-
 lib/stddef.in.h            |    8 +-
 lib/stdint.in.h            |  771 ++++++++-------
 lib/stdio.in.h             |   22 +-
 lib/stdlib.in.h            |   17 +-
 lib/str-two-way.h          |    2 +-
 lib/streq.h                |    2 +-
 lib/striconv.c             |    2 +-
 lib/striconv.h             |    2 +-
 lib/string.in.h            |   18 +-
 lib/strnlen1.c             |    2 +-
 lib/strnlen1.h             |    2 +-
 lib/strstr.c               |    6 +-
 lib/sys_stat.in.h          |  180 +++-
 lib/sys_time.in.h          |    9 +-
 lib/sys_types.in.h         |   44 +-
 lib/time.in.h              |   61 +-
 lib/unistd.in.h            |   56 +-
 lib/unistr.in.h            |    6 +-
 lib/unistr/u8-mbtoucr.c    |  147 +--
 lib/unistr/u8-uctomb-aux.c |   25 +-
 lib/unistr/u8-uctomb.c     |   15 +-
 lib/unitypes.in.h          |    2 +-
 lib/verify.h               |   11 +-
 lib/wchar.in.h             |   58 +-
 lib/wcrtomb.c              |    2 +-
 lib/wcsdup-impl.h          |    2 +-
 lib/wcsdup.c               |    2 +-
 lib/wctob.c                |    2 +-
 lib/wctomb-impl.h          |    2 +-
 lib/wctomb.c               |    2 +-
 lib/wctype.in.h            |   43 +-
 lib/wmemcpy-impl.h         |    2 +-
 lib/wmemcpy.c              |    2 +-
 m4/00gnulib.m4             |    2 +-
 m4/Makefile.in             |   85 +-
 m4/absolute-header.m4      |    2 +-
 m4/assert.m4               |    2 +-
 m4/btowc.m4                |    2 +-
 m4/builtin-expect.m4       |   49 +
 m4/codeset.m4              |    3 +-
 m4/config-h.m4             |    2 +-
 m4/configmake.m4           |    2 +-
 m4/extensions.m4           |   46 +-
 m4/extern-inline.m4        |    3 +-
 m4/fcntl-o.m4              |    2 +-
 m4/getopt.m4               |   31 +-
 m4/gettext.m4              |   31 +-
 m4/gettimeofday.m4         |   40 +-
 m4/glibc21.m4              |    2 +-
 m4/gnulib-common.m4        |   15 +-
 m4/gnulib-comp.m4          |   48 +-
 m4/hard-locale.m4          |   11 +
 m4/iconv.m4                |   26 +-
 m4/iconv_h.m4              |    2 +-
 m4/iconv_open.m4           |    2 +-
 m4/include_next.m4         |    7 +-
 m4/inline.m4               |    2 +-
 m4/intlmacosx.m4           |    2 +-
 m4/lib-ld.m4               |  142 +--
 m4/lib-link.m4             |    2 +-
 m4/lib-prefix.m4           |  109 ++-
 m4/libunistring-base.m4    |    2 +-
 m4/limits-h.m4             |   31 +
 m4/localcharset.m4         |    2 +-
 m4/locale-fr.m4            |    2 +-
 m4/locale-ja.m4            |    2 +-
 m4/locale-zh.m4            |    2 +-
 m4/locale_h.m4             |    2 +-
 m4/localtime-buffer.m4     |   21 +
 m4/longlong.m4             |    2 +-
 m4/mbrtowc.m4              |   60 +-
 m4/mbsinit.m4              |    2 +-
 m4/mbsrtowcs.m4            |    2 +-
 m4/mbstate_t.m4            |    2 +-
 m4/mbtowc.m4               |    2 +-
 m4/memchr.m4               |    2 +-
 m4/mmap-anon.m4            |    2 +-
 m4/multiarch.m4            |    2 +-
 m4/nls.m4                  |    4 +-
 m4/nocrash.m4              |    5 +-
 m4/off_t.m4                |    2 +-
 m4/po.m4                   |    2 +-
 m4/progtest.m4             |    6 +-
 m4/ssize_t.m4              |    2 +-
 m4/stdbool.m4              |   60 +-
 m4/stddef_h.m4             |    2 +-
 m4/stdint.m4               |   91 +-
 m4/stdio_h.m4              |   14 +-
 m4/stdlib_h.m4             |    7 +-
 m4/string_h.m4             |    2 +-
 m4/strstr.m4               |   12 +-
 m4/sys_socket_h.m4         |    2 +-
 m4/sys_stat_h.m4           |   20 +-
 m4/sys_time_h.m4           |    5 +-
 m4/sys_types_h.m4          |   37 +-
 m4/time_h.m4               |   14 +-
 m4/unistd_h.m4             |   12 +-
 m4/warn-on-use.m4          |    2 +-
 m4/wchar_h.m4              |   23 +-
 m4/wchar_t.m4              |    2 +-
 m4/wcrtomb.m4              |    2 +-
 m4/wcsdup.m4               |    2 +-
 m4/wctob.m4                |    2 +-
 m4/wctomb.m4               |    2 +-
 m4/wctype_h.m4             |    6 +-
 m4/wint_t.m4               |   48 +-
 m4/wmemcpy.m4              |    2 +-
 po/da.gmo                  |  Bin 30452 -> 30123 bytes
 po/de.gmo                  |  Bin 31343 -> 31032 bytes
 po/en@quot.gmo             |  Bin 29950 -> 29720 bytes
 po/en@quot.po              |  138 ++-
 po/en_AU.gmo               |  Bin 29991 -> 29755 bytes
 po/en_CA.gmo               |  Bin 29989 -> 29753 bytes
 po/en_GB.gmo               |  Bin 29988 -> 29752 bytes
 po/en_US.gmo               |  Bin 29977 -> 29741 bytes
 po/eo.gmo                  |  Bin 30493 -> 30168 bytes
 po/fi.gmo                  |  Bin 31174 -> 30852 bytes
 po/fr.gmo                  |  Bin 31815 -> 31495 bytes
 po/hr.gmo                  |  Bin 30670 -> 30354 bytes
 po/hu.gmo                  |  Bin 32415 -> 32072 bytes
 po/nb.gmo                  |  Bin 30171 -> 29873 bytes
 po/ru.gmo                  |  Bin 39297 -> 39007 bytes
 po/sv.gmo                  |  Bin 30406 -> 30105 bytes
 po/trader.pot              |  118 +--
 src/Makefile.in            |   89 +-
 179 files changed, 7157 insertions(+), 3587 deletions(-)
 create mode 100644 data/Makefile.in
 create mode 100644 lib/_Noreturn.h
 create mode 100644 lib/getopt-cdefs.in.h
 create mode 100644 lib/getopt-core.h
 create mode 100644 lib/getopt-ext.h
 create mode 100644 lib/getopt-pfx-core.h
 create mode 100644 lib/getopt-pfx-ext.h
 create mode 100644 lib/hard-locale.c
 create mode 100644 lib/hard-locale.h
 create mode 100644 lib/limits.in.h
 create mode 100644 lib/localtime-buffer.c
 create mode 100644 lib/localtime-buffer.h
 create mode 100644 m4/builtin-expect.m4
 create mode 100644 m4/hard-locale.m4
 create mode 100644 m4/limits-h.m4
 create mode 100644 m4/localtime-buffer.m4

diff --git a/Makefile.in b/Makefile.in
index c017234..3901f27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,12 +17,12 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
 # Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id: Makefile.am 663 2016-01-04 22:25:51Z john $
+# $Id: b00291c0fcd9d6b5823eea1ae09772f653b1928c $
 #
 # This file, Makefile.am, contains the top-level Makefile for Star
 # Traders.  It needs to be processed by automake to produce the
@@ -123,32 +123,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \
-	$(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
-	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
-	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
-	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \
-	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ssize_t.m4 \
-	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
-	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -225,15 +229,15 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/build-aux/ar-lib $(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
 	$(top_srcdir)/build-aux/config.rpath \
 	$(top_srcdir)/build-aux/config.sub \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \
-	build-aux/README build-aux/ar-lib build-aux/compile \
-	build-aux/config.guess build-aux/config.rpath \
-	build-aux/config.sub build-aux/install-sh build-aux/missing
+	build-aux/README build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub \
+	build-aux/install-sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -269,9 +273,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -297,7 +301,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -306,6 +311,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
@@ -318,6 +324,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
@@ -384,6 +391,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -425,6 +433,8 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
 GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
@@ -473,6 +483,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -494,7 +505,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
@@ -524,6 +537,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
 GNULIB_WCSCPY = @GNULIB_WCSCPY@
 GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
 GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
 GNULIB_WCSLEN = @GNULIB_WCSLEN@
 GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
 GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
@@ -554,8 +568,10 @@ GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
@@ -566,6 +582,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
@@ -655,6 +672,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -688,6 +706,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
@@ -695,6 +714,8 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
@@ -716,6 +737,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@
 HAVE_WCSCPY = @HAVE_WCSCPY@
 HAVE_WCSCSPN = @HAVE_WCSCSPN@
 HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
 HAVE_WCSLEN = @HAVE_WCSLEN@
 HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
 HAVE_WCSNCAT = @HAVE_WCSNCAT@
@@ -764,6 +786,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
@@ -772,6 +795,7 @@ LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
@@ -779,6 +803,7 @@ MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -794,6 +819,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -816,6 +842,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -827,6 +856,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -922,6 +952,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -936,7 +967,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
@@ -949,6 +982,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
@@ -976,6 +1010,8 @@ VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -984,7 +1020,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1000,6 +1035,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+desktopdir = @desktopdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -1014,6 +1050,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+iconsdir = @iconsdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -1039,21 +1076,21 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-# Find various M4 macro snippets
-ACLOCAL_AMFLAGS = -I m4
-
 # Subdirectories to recurse into
-SUBDIRS = lib src doc po m4
+SUBDIRS = lib src po data doc m4
 
 # Additional files to distribute
-EXTRA_DIST = build-aux/bootstrap
+EXTRA_DIST = \
+	build-aux/bootstrap		\
+	build-aux/msgfmt-desktop
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1079,9 +1116,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
@@ -1092,7 +1129,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
@@ -1273,6 +1310,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -1280,7 +1318,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
diff --git a/aclocal.m4 b/aclocal.m4
index 9a9f408..9376535 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,282 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -56,66 +332,6 @@ m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_AR([ACT-IF-FAIL])
-# -------------------------
-# Try to determine the archiver interface, and trigger the ar-lib wrapper
-# if it is needed.  If the detection of archiver interface fails, run
-# ACT-IF-FAIL (default is to abort configure with a proper error message).
-AC_DEFUN([AM_PROG_AR],
-[AC_BEFORE([$0], [LT_INIT])dnl
-AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([ar-lib])dnl
-AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
-: ${AR=ar}
-
-AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
-  [AC_LANG_PUSH([C])
-   am_cv_ar_interface=ar
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
-     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([am_ar_try])
-      if test "$ac_status" -eq 0; then
-        am_cv_ar_interface=ar
-      else
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-        AC_TRY_EVAL([am_ar_try])
-        if test "$ac_status" -eq 0; then
-          am_cv_ar_interface=lib
-        else
-          am_cv_ar_interface=unknown
-        fi
-      fi
-      rm -f conftest.lib libconftest.a
-     ])
-   AC_LANG_POP([C])])
-
-case $am_cv_ar_interface in
-ar)
-  ;;
-lib)
-  # Microsoft lib, so override with the ar-lib wrapper script.
-  # FIXME: It is wrong to rewrite AR.
-  # But if we don't then we get into trouble of one sort or another.
-  # A longer-term fix would be to have automake use am__AR in this case,
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-  # similar.
-  AR="$am_aux_dir/ar-lib $AR"
-  ;;
-unknown)
-  m4_default([$1],
-             [AC_MSG_ERROR([could not determine $AR interface])])
-  ;;
-esac
-AC_SUBST([AR])dnl
-])
-
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
@@ -705,6 +921,42 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
@@ -1219,6 +1471,7 @@ m4_include([m4/ax_cflags_warn_all.m4])
 m4_include([m4/ax_require_defined.m4])
 m4_include([m4/ax_with_curses.m4])
 m4_include([m4/btowc.m4])
+m4_include([m4/builtin-expect.m4])
 m4_include([m4/codeset.m4])
 m4_include([m4/config-h.m4])
 m4_include([m4/configmake.m4])
@@ -1231,6 +1484,7 @@ m4_include([m4/gettimeofday.m4])
 m4_include([m4/glibc21.m4])
 m4_include([m4/gnulib-common.m4])
 m4_include([m4/gnulib-comp.m4])
+m4_include([m4/hard-locale.m4])
 m4_include([m4/iconv.m4])
 m4_include([m4/iconv_h.m4])
 m4_include([m4/iconv_open.m4])
@@ -1241,11 +1495,13 @@ m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
 m4_include([m4/libunistring-base.m4])
+m4_include([m4/limits-h.m4])
 m4_include([m4/localcharset.m4])
 m4_include([m4/locale-fr.m4])
 m4_include([m4/locale-ja.m4])
 m4_include([m4/locale-zh.m4])
 m4_include([m4/locale_h.m4])
+m4_include([m4/localtime-buffer.m4])
 m4_include([m4/longlong.m4])
 m4_include([m4/mbrtowc.m4])
 m4_include([m4/mbsinit.m4])
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 1659250..2e9ad7f 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2016-10-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-08-20'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -680,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -697,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -896,7 +903,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -919,7 +926,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -965,6 +972,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -990,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1022,6 +1035,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1120,7 +1136,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1269,6 +1285,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1282,9 +1301,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1306,7 +1325,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1337,7 +1356,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1379,7 +1398,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1390,23 +1409,25 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 98183ff..af3c415 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2016 Free Software Foundation, Inc.
+#   Copyright 1996-2017 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 1acc966..dd2ca93 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2016-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-08-20'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-08-20'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -118,7 +117,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -302,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -429,6 +429,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -521,7 +522,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -644,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -1023,7 +1032,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1033,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1383,14 +1392,14 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1408,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1541,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff --git a/config.h.in b/config.h.in
index ec23eba..056c819 100644
--- a/config.h.in
+++ b/config.h.in
@@ -15,6 +15,9 @@
 /* Define to the number of bits in type 'wint_t'. */
 #undef BITSIZEOF_WINT_T
 
+/* Define to 1 if the C locale may have encoding errors. */
+#undef C_LOCALE_MAYBE_EILSEQ
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -41,9 +44,6 @@
 /* Define to 1 when the gnulib module btowc should be tested. */
 #undef GNULIB_TEST_BTOWC
 
-/* Define to 1 when the gnulib module getopt-gnu should be tested. */
-#undef GNULIB_TEST_GETOPT_GNU
-
 /* Define to 1 when the gnulib module gettimeofday should be tested. */
 #undef GNULIB_TEST_GETTIMEOFDAY
 
@@ -102,6 +102,9 @@
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
+/* Define to 1 if you have the <crtdefs.h> header file. */
+#undef HAVE_CRTDEFS_H
+
 /* Define to 1 if a SysV or X/Open compatible Curses library is present */
 #undef HAVE_CURSES
 
@@ -125,10 +128,6 @@
    don't. */
 #undef HAVE_DECL_GETC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#undef HAVE_DECL_GETENV
-
 /* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
    don't. */
 #undef HAVE_DECL_MBRTOWC
@@ -188,6 +187,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if the system has the type 'long long int'. */
 #undef HAVE_LONG_LONG_INT
 
@@ -478,6 +480,9 @@
 /* Define to 1 if pwrite is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_PWRITE
 
+/* Define to 1 if qsort_r is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_QSORT_R
+
 /* Define to 1 if random is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_RANDOM
 
@@ -604,6 +609,9 @@
 /* Define to 1 if towctrans is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TOWCTRANS
 
+/* Define to 1 if truncate is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_TRUNCATE
+
 /* Define to 1 if ttyname_r is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_TTYNAME_R
 
@@ -664,6 +672,9 @@
 /* Define to 1 if wcsdup is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSDUP
 
+/* Define to 1 if wcsftime is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSFTIME
+
 /* Define to 1 if wcslen is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_WCSLEN
 
@@ -766,6 +777,9 @@
 /* Define to 1 if you have the <sys/bitypes.h> header file. */
 #undef HAVE_SYS_BITYPES_H
 
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
 /* Define to 1 if you have the <sys/inttypes.h> header file. */
 #undef HAVE_SYS_INTTYPES_H
 
@@ -778,9 +792,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
@@ -832,12 +843,19 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
-/* Define to 1 if you have the `_ftime' function. */
-#undef HAVE__FTIME
-
 /* define if your compiler has __attribute__ */
 #undef HAVE___ATTRIBUTE__
 
+/* Define to 1 if the compiler supports __builtin_expect,
+   and to 2 if <builtins.h> does.  */
+#undef HAVE___BUILTIN_EXPECT
+#ifndef HAVE___BUILTIN_EXPECT
+# define __builtin_expect(e, c) (e)
+#elif HAVE___BUILTIN_EXPECT == 2
+# include <builtins.h>
+#endif
+    
+
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
@@ -864,6 +882,12 @@
 /* Define if the mbrtowc function returns a wrong return value. */
 #undef MBRTOWC_RETVAL_BUG
 
+/* Use GNU style printf and scanf.  */
+#ifndef __USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
+
+
 /* Define to 1 if assertions should be disabled. */
 #undef NDEBUG
 
@@ -913,7 +937,7 @@
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on OS X.  */
+/* Enable general extensions on macOS.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
 #endif
@@ -921,14 +945,38 @@
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Use GNU style printf and scanf.  */
-#ifndef __USE_MINGW_ANSI_STDIO
-# undef __USE_MINGW_ANSI_STDIO
-#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
@@ -956,10 +1004,6 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
-   stat.st_size becomes 64-bit. */
-#undef _GL_WINDOWS_64_BIT_ST_SIZE
-
 /* Define to 1 on Solaris. */
 #undef _LCONV_C99
 
@@ -994,6 +1038,12 @@
    used. */
 #undef __GETOPT_PREFIX
 
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_CONSTANT_MACROS
+
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_LIMIT_MACROS
+
 /* Please see the Gnulib manual for how to use these macros.
 
    Suppress extern inline with HP-UX cc, as it appears to be broken; see
@@ -1040,6 +1090,7 @@
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/configure b/configure
index 4496974..828557e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Star Traders 7.9.
+# Generated by GNU Autoconf 2.69 for Star Traders 7.10-pre1.
 #
 # Report bugs to <J.Zaitseff@zap.org.au>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Star Traders'
 PACKAGE_TARNAME='trader'
-PACKAGE_VERSION='7.9'
-PACKAGE_STRING='Star Traders 7.9'
+PACKAGE_VERSION='7.10-pre1'
+PACKAGE_STRING='Star Traders 7.10-pre1'
 PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
 PACKAGE_URL='http://www.zap.org.au/software/trader/'
 
@@ -627,7 +627,6 @@ gt_needs=
 ac_func_list=
 gl_getopt_required=POSIX
 ac_header_list=
-gl_getopt_required=POSIX
 ac_subst_vars='gltests_LTLIBOBJS
 gltests_LIBOBJS
 gl_LTLIBOBJS
@@ -636,7 +635,13 @@ am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-CURSES_LIB
+iconsdir
+desktopdir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+CURSES_CFLAGS
+CURSES_LIBS
 LIBGNU_LTLIBDEPS
 LIBGNU_LIBDEPS
 gltests_WITNESS
@@ -655,6 +660,7 @@ GNULIB_WCTRANS
 GNULIB_ISWCTYPE
 GNULIB_WCTYPE
 GNULIB_ISWBLANK
+HAVE_CRTDEFS_H
 HAVE_WINT_T
 HAVE_FEATURES_H
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
@@ -674,26 +680,12 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC
 TIME_H_DEFINES_STRUCT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_TIME_H
 NEXT_TIME_H
-REPLACE_LOCALTIME
-REPLACE_GMTIME
-REPLACE_TIMEGM
-REPLACE_NANOSLEEP
-REPLACE_MKTIME
-REPLACE_LOCALTIME_R
-HAVE_TIMEGM
-HAVE_STRPTIME
-HAVE_NANOSLEEP
-HAVE_DECL_LOCALTIME_R
-GNULIB_TIME_RZ
-GNULIB_TIME_R
-GNULIB_TIMEGM
-GNULIB_STRPTIME
-GNULIB_NANOSLEEP
-GNULIB_MKTIME
+WINDOWS_STAT_INODES
 WINDOWS_64_BIT_OFF_T
 NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H
 NEXT_SYS_TYPES_H
 WINDOWS_64_BIT_ST_SIZE
+WINDOWS_STAT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
 NEXT_SYS_STAT_H
 REPLACE_UTIMENSAT
@@ -716,6 +708,7 @@ HAVE_LCHMOD
 HAVE_FUTIMENS
 HAVE_FSTATAT
 HAVE_FCHMODAT
+GNULIB_OVERRIDES_STRUCT_STAT
 GNULIB_UTIMENSAT
 GNULIB_STAT
 GNULIB_MKNODAT
@@ -839,6 +832,9 @@ GNULIB_DPRINTF
 GL_GENERATE_STDINT_H_FALSE
 GL_GENERATE_STDINT_H_TRUE
 STDINT_H
+HAVE_SYS_INTTYPES_H
+HAVE_SYS_BITYPES_H
+HAVE_C99_STDINT_H
 WINT_T_SUFFIX
 WCHAR_T_SUFFIX
 SIG_ATOMIC_T_SUFFIX
@@ -852,8 +848,6 @@ BITSIZEOF_WCHAR_T
 BITSIZEOF_SIG_ATOMIC_T
 BITSIZEOF_SIZE_T
 BITSIZEOF_PTRDIFF_T
-HAVE_SYS_BITYPES_H
-HAVE_SYS_INTTYPES_H
 HAVE_STDINT_H
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H
 NEXT_STDINT_H
@@ -862,6 +856,7 @@ HAVE_INTTYPES_H
 HAVE_WCHAR_H
 HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_LONG_LONG_INT
+GNULIB_OVERRIDES_WINT_T
 HAVE__BOOL
 GL_GENERATE_STDBOOL_H_FALSE
 GL_GENERATE_STDBOOL_H_TRUE
@@ -971,6 +966,7 @@ HAVE_REALPATH
 HAVE_RANDOM_R
 HAVE_RANDOM_H
 HAVE_RANDOM
+HAVE_QSORT_R
 HAVE_PTSNAME_R
 HAVE_PTSNAME
 HAVE_POSIX_OPENPT
@@ -1042,6 +1038,11 @@ GNULIB_SETLOCALE
 GNULIB_LOCALECONV
 LOCALCHARSET_TESTS_ENVIRONMENT
 GLIBC21
+GL_GENERATE_LIMITS_H_FALSE
+GL_GENERATE_LIMITS_H_TRUE
+LIMITS_H
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H
+NEXT_LIMITS_H
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H
 NEXT_ICONV_H
 GL_GENERATE_ICONV_H_FALSE
@@ -1052,18 +1053,44 @@ REPLACE_ICONV_OPEN
 REPLACE_ICONV
 ICONV_CONST
 GNULIB_ICONV
+REPLACE_LOCALTIME
+REPLACE_GMTIME
+REPLACE_TZSET
+REPLACE_TIMEGM
+REPLACE_STRFTIME
+REPLACE_NANOSLEEP
+REPLACE_MKTIME
+REPLACE_LOCALTIME_R
+REPLACE_CTIME
+HAVE_TIMEZONE_T
+HAVE_TZSET
+HAVE_TIMEGM
+HAVE_STRPTIME
+HAVE_NANOSLEEP
+HAVE_DECL_LOCALTIME_R
+GNULIB_TZSET
+GNULIB_TIME_RZ
+GNULIB_TIME_R
+GNULIB_TIMEGM
+GNULIB_STRPTIME
+GNULIB_STRFTIME
+GNULIB_NANOSLEEP
+GNULIB_LOCALTIME
+GNULIB_MKTIME
+GNULIB_CTIME
 HAVE_WINSOCK2_H
 NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H
 NEXT_SYS_TIME_H
 REPLACE_STRUCT_TIMEVAL
 REPLACE_GETTIMEOFDAY
-HAVE_TIMEZONE_T
 HAVE_SYS_TIME_H
 HAVE_STRUCT_TIMEVAL
 HAVE_GETTIMEOFDAY
 GNULIB_GETTIMEOFDAY
 GNULIB_GL_UNISTD_H_GETOPT
+GETOPT_CDEFS_H
 GETOPT_H
+HAVE_SYS_CDEFS_H
 HAVE_GETOPT_H
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H
 NEXT_GETOPT_H
@@ -1078,6 +1105,7 @@ REPLACE_USLEEP
 REPLACE_UNLINKAT
 REPLACE_UNLINK
 REPLACE_TTYNAME_R
+REPLACE_TRUNCATE
 REPLACE_SYMLINKAT
 REPLACE_SYMLINK
 REPLACE_SLEEP
@@ -1111,12 +1139,14 @@ HAVE_DECL_SETHOSTNAME
 HAVE_DECL_GETUSERSHELL
 HAVE_DECL_GETPAGESIZE
 HAVE_DECL_GETLOGIN_R
+HAVE_DECL_GETLOGIN
 HAVE_DECL_GETDOMAINNAME
 HAVE_DECL_FDATASYNC
 HAVE_DECL_FCHDIR
 HAVE_DECL_ENVIRON
 HAVE_USLEEP
 HAVE_UNLINKAT
+HAVE_TRUNCATE
 HAVE_SYMLINKAT
 HAVE_SYMLINK
 HAVE_SLEEP
@@ -1153,6 +1183,7 @@ GNULIB_UNLINK
 GNULIB_UNISTD_H_SIGPIPE
 GNULIB_UNISTD_H_NONBLOCKING
 GNULIB_TTYNAME_R
+GNULIB_TRUNCATE
 GNULIB_SYMLINKAT
 GNULIB_SYMLINK
 GNULIB_SLEEP
@@ -1197,6 +1228,7 @@ GNULIB_CHDIR
 pkglibexecdir
 lispdir
 LOCALE_FR
+REPLACE_WCSFTIME
 REPLACE_WCSWIDTH
 REPLACE_WCWIDTH
 REPLACE_WCSNRTOMBS
@@ -1212,6 +1244,7 @@ REPLACE_BTOWC
 REPLACE_MBSTATE_T
 HAVE_DECL_WCWIDTH
 HAVE_DECL_WCTOB
+HAVE_WCSFTIME
 HAVE_WCSWIDTH
 HAVE_WCSTOK
 HAVE_WCSSTR
@@ -1249,6 +1282,7 @@ HAVE_MBRLEN
 HAVE_MBRTOWC
 HAVE_MBSINIT
 HAVE_BTOWC
+GNULIB_WCSFTIME
 GNULIB_WCSWIDTH
 GNULIB_WCSTOK
 GNULIB_WCSSTR
@@ -1318,7 +1352,6 @@ USE_NLS
 SED
 RANLIB
 ARFLAGS
-ac_ct_AR
 AR
 EGREP
 GREP
@@ -1340,6 +1373,9 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -1410,6 +1446,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
+enable_maintainer_mode
 enable_dependency_tracking
 enable_nls
 with_gnu_ld
@@ -1429,7 +1466,11 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CURSES_LIB'
+CURSES_LIBS
+CURSES_CFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR'
 
 
 # Initialize some variables set by options.
@@ -1980,7 +2021,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Star Traders 7.9 to adapt to many kinds of systems.
+\`configure' configures Star Traders 7.10-pre1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2051,7 +2092,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Star Traders 7.9:";;
+     short | recursive ) echo "Configuration of Star Traders 7.10-pre1:";;
    esac
   cat <<\_ACEOF
 
@@ -2061,6 +2102,9 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --disable-maintainer-mode
+                          disable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -2089,7 +2133,14 @@ Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  CURSES_LIB  linker library for Curses, e.g. -lcurses
+  CURSES_LIBS linker library for Curses, e.g. -lcurses
+  CURSES_CFLAGS
+              preprocessor flags for Curses, e.g. -I/usr/include/ncursesw
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2158,7 +2209,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Star Traders configure 7.9
+Star Traders configure 7.10-pre1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2810,7 +2861,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Star Traders $as_me 7.9, which was
+It was created by Star Traders $as_me 7.10-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3094,10 +3145,12 @@ gt_needs="$gt_needs "
 as_fn_append ac_func_list " btowc"
 gl_getopt_required=GNU
 as_fn_append ac_header_list " getopt.h"
+as_fn_append ac_header_list " sys/cdefs.h"
 as_fn_append ac_header_list " sys/time.h"
 as_fn_append ac_header_list " sys/socket.h"
 as_fn_append ac_func_list " gettimeofday"
 as_fn_append ac_header_list " iconv.h"
+as_fn_append ac_header_list " limits.h"
 as_fn_append ac_header_list " unistd.h"
 as_fn_append ac_func_list " symlink"
 as_fn_append ac_header_list " xlocale.h"
@@ -3110,6 +3163,7 @@ as_fn_append ac_header_list " wchar.h"
 as_fn_append ac_header_list " stdint.h"
 as_fn_append ac_header_list " sys/stat.h"
 as_fn_append ac_header_list " features.h"
+as_fn_append ac_header_list " crtdefs.h"
 as_fn_append ac_func_list " wcrtomb"
 as_fn_append ac_func_list " wcsdup"
 as_fn_append ac_func_list " wctob"
@@ -3189,6 +3243,7 @@ $as_echo "#define PACKAGE_AUTHOR \"John Zaitseff\"" >>confdefs.h
 
 
 
+
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
@@ -3706,7 +3761,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='trader'
- VERSION='7.9'
+ VERSION='7.10-pre1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3800,6 +3855,29 @@ END
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5483,10 +5561,22 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
   $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
-  $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
-
   $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
+  $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  $as_echo "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
@@ -5582,177 +5672,7 @@ $as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
       ARFLAGS='-o'
     fi
   else
-                                        if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar lib "link -lib"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar lib "link -lib"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
-if ${am_cv_ar_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   am_cv_ar_interface=ar
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int some_variable = 0;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-  (eval $am_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-        am_cv_ar_interface=ar
-      else
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
-  (eval $am_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        if test "$ac_status" -eq 0; then
-          am_cv_ar_interface=lib
-        else
-          am_cv_ar_interface=unknown
-        fi
-      fi
-      rm -f conftest.lib libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-$as_echo "$am_cv_ar_interface" >&6; }
-
-case $am_cv_ar_interface in
-ar)
-  ;;
-lib)
-  # Microsoft lib, so override with the ar-lib wrapper script.
-  # FIXME: It is wrong to rewrite AR.
-  # But if we don't then we get into trouble of one sort or another.
-  # A longer-term fix would be to have automake use am__AR in this case,
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-  # similar.
-  AR="$am_aux_dir/ar-lib $AR"
-  ;;
-unknown)
-  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
-  ;;
-esac
-
+                                                :
   fi
 
         if test -n "$ac_tool_prefix"; then
@@ -5964,6 +5884,7 @@ fi
   # Code from module absolute-header:
   # Code from module assert:
   # Code from module btowc:
+  # Code from module builtin-expect:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module config-h:
@@ -5977,14 +5898,17 @@ fi
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
   # Code from module iconv_open:
   # Code from module include_next:
   # Code from module inline:
+  # Code from module limits-h:
   # Code from module localcharset:
   # Code from module locale:
+  # Code from module localtime-buffer:
   # Code from module mbrtowc:
   # Code from module mbsinit:
   # Code from module mbsrtowcs:
@@ -6648,38 +6572,12 @@ if test "${PATH_SEPARATOR+set}" != set; then
        }
 fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+$as_echo_n "checking for ld... " >&6; }
+elif test "$GCC" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
 elif test "$with_gnu_ld" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
@@ -6687,44 +6585,106 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [\\/]* | ?:[\\/]*)
+          re_direlt='/[^/][^/]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
       esac
     fi
-  done
-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_save_ifs"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_save_ifs"
+    fi
+    case $host in
+      *-*-aix*)
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined __powerpc64__ || defined _ARCH_PPC64
+           yes
+           #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  # The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+
 fi
+rm -f conftest*
+
+        ;;
+    esac
+
 fi
 
-LD="$acl_cv_path_LD"
+  LD="$acl_cv_path_LD"
+fi
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+  as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if ${acl_cv_prog_gnu_ld+:} false; then :
@@ -6781,11 +6741,16 @@ fi
 
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
+if ${acl_cv_libdirstems+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+     acl_libdirstem2=
+     case "$host_os" in
+       solaris*)
+                                                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
 if ${gl_cv_solaris_64bit+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -6810,37 +6775,51 @@ rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
 $as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+         if test $gl_cv_solaris_64bit = yes; then
+           acl_libdirstem=lib/64
+           case "$host_cpu" in
+             sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+             i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+           esac
+         fi
+         ;;
+       *)
+                                    searchpath=`(if test -f /usr/bin/gcc \
+                         && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+                        LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+                      else \
+                        LC_ALL=C $CC -print-search-dirs; \
+                      fi) 2>/dev/null \
+                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+         if test -n "$searchpath"; then
+           acl_save_IFS="${IFS= 	}"; IFS=":"
+           for searchdir in $searchpath; do
+             if test -d "$searchdir"; then
+               case "$searchdir" in
+                 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+                 */../ | */.. )
+                   # Better ignore directories of this form. They are misleading.
+                   ;;
+                 *) searchdir=`cd "$searchdir" && pwd`
+                    case "$searchdir" in
+                      */lib64 ) acl_libdirstem=lib64 ;;
+                    esac ;;
+               esac
+             fi
+           done
+           IFS="$acl_save_IFS"
+         fi
+         ;;
+     esac
+     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+$as_echo "$acl_cv_libdirstems" >&6; }
+  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
+  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
 
 
 
@@ -7451,16 +7430,21 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -8213,20 +8197,25 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -8245,20 +8234,25 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -8435,6 +8429,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
   GNULIB_WCSSTR=0;
   GNULIB_WCSTOK=0;
   GNULIB_WCSWIDTH=0;
+  GNULIB_WCSFTIME=0;
     HAVE_BTOWC=1;
   HAVE_MBSINIT=1;
   HAVE_MBRTOWC=1;
@@ -8472,6 +8467,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
   HAVE_WCSSTR=1;
   HAVE_WCSTOK=1;
   HAVE_WCSWIDTH=1;
+  HAVE_WCSFTIME=1;
   HAVE_DECL_WCTOB=1;
   HAVE_DECL_WCWIDTH=1;
   REPLACE_MBSTATE_T=0;
@@ -8487,6 +8483,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
   REPLACE_WCSNRTOMBS=0;
   REPLACE_WCWIDTH=0;
   REPLACE_WCSWIDTH=0;
+  REPLACE_WCSFTIME=0;
 
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
@@ -8511,12 +8508,13 @@ extern int zero (void);
 int main () { return zero(); }
 
 _ACEOF
+                              save_ac_compile="$ac_compile"
+     ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-       mv conftest.$ac_objext conftest1.$ac_objext
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8532,12 +8530,12 @@ _ACEOF
 int zero (void) { return 0; }
 
 _ACEOF
+              ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-         mv conftest.$ac_objext conftest2.$ac_objext
          if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
            :
          else
@@ -8545,6 +8543,7 @@ _ACEOF
          fi
        fi
      fi
+     ac_compile="$save_ac_compile"
      rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
 
 fi
@@ -8793,6 +8792,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
   GNULIB_SLEEP=0;
   GNULIB_SYMLINK=0;
   GNULIB_SYMLINKAT=0;
+  GNULIB_TRUNCATE=0;
   GNULIB_TTYNAME_R=0;
   GNULIB_UNISTD_H_NONBLOCKING=0;
   GNULIB_UNISTD_H_SIGPIPE=0;
@@ -8829,12 +8829,14 @@ $as_echo "$gt_cv_locale_fr" >&6; }
   HAVE_SLEEP=1;
   HAVE_SYMLINK=1;
   HAVE_SYMLINKAT=1;
+  HAVE_TRUNCATE=1;
   HAVE_UNLINKAT=1;
   HAVE_USLEEP=1;
   HAVE_DECL_ENVIRON=1;
   HAVE_DECL_FCHDIR=1;
   HAVE_DECL_FDATASYNC=1;
   HAVE_DECL_GETDOMAINNAME=1;
+  HAVE_DECL_GETLOGIN=1;
   HAVE_DECL_GETLOGIN_R=1;
   HAVE_DECL_GETPAGESIZE=1;
   HAVE_DECL_GETUSERSHELL=1;
@@ -8868,6 +8870,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
   REPLACE_SLEEP=0;
   REPLACE_SYMLINK=0;
   REPLACE_SYMLINKAT=0;
+  REPLACE_TRUNCATE=0;
   REPLACE_TTYNAME_R=0;
   REPLACE_UNLINK=0;
   REPLACE_UNLINKAT=0;
@@ -9427,11 +9430,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
@@ -9614,33 +9618,12 @@ $as_echo "$gl_cv_func_getopt_long_gnu" >&6; }
 
 
 
-
-
-    REPLACE_GETOPT=0
-    if test -n "$gl_replace_getopt"; then
-      REPLACE_GETOPT=1
-    fi
-
-  if test $REPLACE_GETOPT = 1; then
-
-  GETOPT_H=getopt.h
-
-$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
-
-
-
-  fi
-
-ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getenv" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETENV $ac_have_decl
-_ACEOF
+  GNULIB_GETTIMEOFDAY=0;
+    HAVE_GETTIMEOFDAY=1;
+  HAVE_STRUCT_TIMEVAL=1;
+  HAVE_SYS_TIME_H=1;
+  REPLACE_GETTIMEOFDAY=0;
+  REPLACE_STRUCT_TIMEVAL=0;
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
@@ -9691,15 +9674,6 @@ _ACEOF
  esac
 
 
-  GNULIB_GETTIMEOFDAY=0;
-    HAVE_GETTIMEOFDAY=1;
-  HAVE_STRUCT_TIMEVAL=1;
-  HAVE_SYS_TIME_H=1;
-  HAVE_TIMEZONE_T=0;
-  REPLACE_GETTIMEOFDAY=0;
-  REPLACE_STRUCT_TIMEVAL=0;
-
-
 
 
 
@@ -9946,6 +9920,38 @@ fi
 
 
 
+  NEED_LOCALTIME_BUFFER=0
+
+
+  GNULIB_CTIME=0;
+  GNULIB_MKTIME=0;
+  GNULIB_LOCALTIME=0;
+  GNULIB_NANOSLEEP=0;
+  GNULIB_STRFTIME=0;
+  GNULIB_STRPTIME=0;
+  GNULIB_TIMEGM=0;
+  GNULIB_TIME_R=0;
+  GNULIB_TIME_RZ=0;
+  GNULIB_TZSET=0;
+    HAVE_DECL_LOCALTIME_R=1;
+  HAVE_NANOSLEEP=1;
+  HAVE_STRPTIME=1;
+  HAVE_TIMEGM=1;
+  HAVE_TZSET=1;
+    HAVE_TIMEZONE_T=0;
+        REPLACE_CTIME=GNULIB_PORTCHECK;
+  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
+  REPLACE_MKTIME=GNULIB_PORTCHECK;
+  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
+  REPLACE_STRFTIME=GNULIB_PORTCHECK;
+  REPLACE_TIMEGM=GNULIB_PORTCHECK;
+  REPLACE_TZSET=GNULIB_PORTCHECK;
+
+      : ${GNULIB_GETTIMEOFDAY=0};
+        REPLACE_GMTIME=0;
+  REPLACE_LOCALTIME=0;
+
+
   GNULIB_ICONV=0;
     ICONV_CONST=;
   REPLACE_ICONV=0;
@@ -10264,17 +10270,19 @@ fi
          $am_cv_proto_iconv" >&5
 $as_echo "
          $am_cv_proto_iconv" >&6; }
+  else
+            am_cv_proto_iconv_arg1=""
+  fi
 
 cat >>confdefs.h <<_ACEOF
 #define ICONV_CONST $am_cv_proto_iconv_arg1
 _ACEOF
 
 
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
+     if test -n "$am_cv_proto_iconv_arg1"; then
+       ICONV_CONST="const"
+     fi
 
-  fi
 
 
 
@@ -10329,6 +10337,132 @@ esac
 
 
 
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_limits_h='<'limits.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+$as_echo_n "checking absolute name of <limits.h>... " >&6; }
+if ${gl_cv_next_limits_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+             if test $ac_cv_header_limits_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+_ACEOF
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'limits.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_limits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_limits_h
+           gl_cv_next_limits_h='"'$gl_header'"'
+          else
+               gl_cv_next_limits_h='<'limits.h'>'
+             fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+$as_echo "$gl_cv_next_limits_h" >&6; }
+     fi
+     NEXT_LIMITS_H=$gl_cv_next_limits_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'limits.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_limits_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_LIMITS_H=$gl_next_as_first_directive
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5
+$as_echo_n "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; }
+if ${gl_cv_header_limits_width+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+                           #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+                          #endif
+                          #include <limits.h>
+                          int ullw = ULLONG_WIDTH;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_limits_width=yes
+else
+  gl_cv_header_limits_width=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+$as_echo "$gl_cv_header_limits_width" >&6; }
+  if test "$gl_cv_header_limits_width" = yes; then
+    LIMITS_H=
+  else
+    LIMITS_H=limits.h
+  fi
+
+   if test -n "$LIMITS_H"; then
+  GL_GENERATE_LIMITS_H_TRUE=
+  GL_GENERATE_LIMITS_H_FALSE='#'
+else
+  GL_GENERATE_LIMITS_H_TRUE='#'
+  GL_GENERATE_LIMITS_H_FALSE=
+fi
+
+
+
+
+
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 $as_echo_n "checking for working fcntl.h... " >&6; }
 if ${gl_cv_header_working_fcntl_h+:} false; then :
@@ -11198,6 +11332,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
   HAVE_POSIX_OPENPT=1;
   HAVE_PTSNAME=1;
   HAVE_PTSNAME_R=1;
+  HAVE_QSORT_R=1;
   HAVE_RANDOM=1;
   HAVE_RANDOM_H=1;
   HAVE_RANDOM_R=1;
@@ -11517,59 +11652,67 @@ else
 /* end confdefs.h.  */
 
              #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
+
+             #ifdef __cplusplus
+              typedef bool Bool;
+             #else
+              typedef _Bool Bool;
+              #ifndef bool
+               "error: bool is not defined"
+              #endif
+              #ifndef false
+               "error: false is not defined"
+              #endif
+              #if false
+               "error: false is not 0"
+              #endif
+              #ifndef true
+               "error: true is not defined"
+              #endif
+              #if true != 1
+               "error: true is not 1"
+              #endif
              #endif
+
              #ifndef __bool_true_false_are_defined
               "error: __bool_true_false_are_defined is not defined"
              #endif
 
-             struct s { _Bool s: 1; _Bool t; } s;
+             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
 
              char a[true == 1 ? 1 : -1];
              char b[false == 0 ? 1 : -1];
              char c[__bool_true_false_are_defined == 1 ? 1 : -1];
              char d[(bool) 0.5 == true ? 1 : -1];
              /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
+             char f[(Bool) 0.0 == false ? 1 : -1];
              char g[true];
-             char h[sizeof (_Bool)];
+             char h[sizeof (Bool)];
              char i[sizeof s.t];
              enum { j = false, k = true, l = false * true, m = true * 256 };
              /* The following fails for
                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
+             Bool n[m];
              char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
              /* Catch a bug in an HP-UX C compiler.  See
                 http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                 http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
               */
-             _Bool q = true;
-             _Bool *pq = &q;
+             Bool q = true;
+             Bool *pq = &q;
+             bool *qq = &q;
 
 int
 main ()
 {
 
              bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
+             *pq |= q; *pq |= ! q;
+             *qq |= q; *qq |= ! q;
              /* Refer to every declared value, to avoid compiler optimizations.  */
              return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
+                     + !m + !n + !o + !p + !q + !pq + !qq);
 
   ;
   return 0;
@@ -11596,6 +11739,93 @@ fi
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+$as_echo_n "checking for wint_t... " >&6; }
+if ${gt_cv_c_wint_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+            wint_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wint_t=yes
+else
+  gt_cv_c_wint_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+$as_echo "$gt_cv_c_wint_t" >&6; }
+  if test $gt_cv_c_wint_t = yes; then
+
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5
+$as_echo_n "checking whether wint_t is too small... " >&6; }
+if ${gl_cv_type_wint_t_too_small+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_type_wint_t_too_small=no
+else
+  gl_cv_type_wint_t_too_small=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5
+$as_echo "$gl_cv_type_wint_t_too_small" >&6; }
+    if test $gl_cv_type_wint_t_too_small = yes; then
+      GNULIB_OVERRIDES_WINT_T=1
+    else
+      GNULIB_OVERRIDES_WINT_T=0
+    fi
+  else
+    GNULIB_OVERRIDES_WINT_T=0
+  fi
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
 if ${ac_cv_type_unsigned_long_long_int+:} false; then :
@@ -11719,6 +11949,9 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
 
 
+
+
+
   if test $ac_cv_type_long_long_int = yes; then
     HAVE_LONG_LONG_INT=1
   else
@@ -11852,6 +12085,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -11942,6 +12177,15 @@ uintptr_t h = UINTPTR_MAX;
 intmax_t i = INTMAX_MAX;
 uintmax_t j = UINTMAX_MAX;
 
+/* Check that SIZE_MAX has the correct type, if possible.  */
+#if 201112 <= __STDC_VERSION__
+int k = _Generic (SIZE_MAX, size_t: 0);
+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+       || (0x5110 <= __SUNPRO_C && !__STDC__))
+extern size_t k;
+extern __typeof__ (SIZE_MAX) k;
+#endif
+
 #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \
   ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
@@ -12020,6 +12264,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 
 
@@ -12105,8 +12351,111 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
 $as_echo "$gl_cv_header_working_stdint_h" >&6; }
   fi
+
+  HAVE_C99_STDINT_H=0
+  HAVE_SYS_BITYPES_H=0
+  HAVE_SYS_INTTYPES_H=0
+  STDINT_H=stdint.h
   if test "$gl_cv_header_working_stdint_h" = yes; then
-    STDINT_H=
+    HAVE_C99_STDINT_H=1
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+$as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_predates_cxx11_h=yes
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_predates_cxx11_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5
+$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+
+$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+
+
+$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+$as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
+if ${gl_cv_header_stdint_width+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_width=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            /* Work if build is not clean.  */
+            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+            #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+             #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+            #endif
+            #include <stdint.h>
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+            int iw = UINTMAX_WIDTH;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_width=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+$as_echo "$gl_cv_header_stdint_width" >&6; }
+    if test "$gl_cv_header_stdint_width" = yes; then
+      STDINT_H=
+    fi
   else
             for ac_header in sys/inttypes.h sys/bitypes.h
 do :
@@ -12123,19 +12472,12 @@ done
 
     if test $ac_cv_header_sys_inttypes_h = yes; then
       HAVE_SYS_INTTYPES_H=1
-    else
-      HAVE_SYS_INTTYPES_H=0
     fi
-
     if test $ac_cv_header_sys_bitypes_h = yes; then
       HAVE_SYS_BITYPES_H=1
-    else
-      HAVE_SYS_BITYPES_H=0
     fi
 
 
-
-
   if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
@@ -12429,13 +12771,26 @@ _ACEOF
 
 
 
-          if test $BITSIZEOF_WINT_T -lt 32; then
+          if test $GNULIB_OVERRIDES_WINT_T = 1; then
     BITSIZEOF_WINT_T=32
   fi
 
-    STDINT_H=stdint.h
   fi
 
+    LIMITS_H=limits.h
+   if test -n "$LIMITS_H"; then
+  GL_GENERATE_LIMITS_H_TRUE=
+  GL_GENERATE_LIMITS_H_FALSE='#'
+else
+  GL_GENERATE_LIMITS_H_TRUE='#'
+  GL_GENERATE_LIMITS_H_FALSE=
+fi
+
+
+
+
+
+
    if test -n "$STDINT_H"; then
   GL_GENERATE_STDINT_H_TRUE=
   GL_GENERATE_STDINT_H_FALSE='#'
@@ -12757,6 +13112,7 @@ $as_echo "$gl_cv_func_strstr_works_always" >&6; }
   GNULIB_MKNODAT=0;
   GNULIB_STAT=0;
   GNULIB_UTIMENSAT=0;
+  GNULIB_OVERRIDES_STRUCT_STAT=0;
     HAVE_FCHMODAT=1;
   HAVE_FSTATAT=1;
   HAVE_FUTIMENS=1;
@@ -12933,24 +13289,9 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
 
 
 
-  GNULIB_MKTIME=0;
-  GNULIB_NANOSLEEP=0;
-  GNULIB_STRPTIME=0;
-  GNULIB_TIMEGM=0;
-  GNULIB_TIME_R=0;
-  GNULIB_TIME_RZ=0;
-    HAVE_DECL_LOCALTIME_R=1;
-  HAVE_NANOSLEEP=1;
-  HAVE_STRPTIME=1;
-  HAVE_TIMEGM=1;
-        REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
-  REPLACE_MKTIME=GNULIB_PORTCHECK;
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;
+    WINDOWS_STAT_INODES=0
+
 
-      : ${GNULIB_GETTIMEOFDAY=0};
-        REPLACE_GMTIME=0;
-  REPLACE_LOCALTIME=0;
 
 
 
@@ -13200,44 +13541,13 @@ q
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
-$as_echo_n "checking for wint_t... " >&6; }
-if ${gt_cv_c_wint_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-   before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-            wint_t foo = (wchar_t)'\0';
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gt_cv_c_wint_t=yes
-else
-  gt_cv_c_wint_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-$as_echo "$gt_cv_c_wint_t" >&6; }
-  if test $gt_cv_c_wint_t = yes; then
-
-$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
 
+  if test $ac_cv_header_crtdefs_h = yes; then
+    HAVE_CRTDEFS_H=1
+  else
+    HAVE_CRTDEFS_H=0
   fi
 
 
@@ -13247,6 +13557,7 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h
 
 
 
+
   GNULIB_ISWBLANK=0;
   GNULIB_WCTYPE=0;
   GNULIB_ISWCTYPE=0;
@@ -13462,6 +13773,58 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+$as_echo_n "checking for __builtin_expect... " >&6; }
+if ${gl_cv___builtin_expect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int
+         main (int argc, char **argv)
+         {
+           argc = __builtin_expect (argc, 100);
+           return argv[argc != 100][0];
+         }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect="in <builtins.h>"
+else
+  gl_cv___builtin_expect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+$as_echo "$gl_cv___builtin_expect" >&6; }
+  if test "$gl_cv___builtin_expect" = yes; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+
+  fi
+
+
+
 
           if test "x$datarootdir" = x; then
     datarootdir='${datadir}'
@@ -13509,39 +13872,6 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
 
 
 
-  if test $REPLACE_GETOPT = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
-
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
-
-
-
-
-        GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-
-
-
-$as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
-
-
-
 
 
 
@@ -13553,10 +13883,20 @@ $as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
 
   if test $REPLACE_GETOPT = 1; then
 
-  GETOPT_H=getopt.h
+
+  if test $ac_cv_header_sys_cdefs_h = yes; then
+    HAVE_SYS_CDEFS_H=1
+  else
+    HAVE_SYS_CDEFS_H=0
+  fi
+
+
 
 $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
+  GETOPT_H=getopt.h
+  GETOPT_CDEFS_H=getopt-cdefs.h
+
 
 
   fi
@@ -13582,9 +13922,6 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
   gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
 
-
-
-
         GNULIB_GL_UNISTD_H_GETOPT=1
   fi
 
@@ -13597,6 +13934,7 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
+
   gl_gettimeofday_timezone=void
   if test $ac_cv_func_gettimeofday != yes; then
     HAVE_GETTIMEOFDAY=0
@@ -13604,6 +13942,7 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
 $as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
 if ${gl_cv_func_gettimeofday_clobber+:} false; then :
@@ -13660,12 +13999,15 @@ $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
    *yes)
      REPLACE_GETTIMEOFDAY=1
 
+$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
+
+
+
+
+  NEED_LOCALTIME_BUFFER=1
   REPLACE_GMTIME=1
   REPLACE_LOCALTIME=1
 
-
-$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
-
      ;;
  esac
 
@@ -13732,7 +14074,9 @@ $as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; }
         if test $REPLACE_STRUCT_TIMEVAL = 1; then
       REPLACE_GETTIMEOFDAY=1
     fi
-
+            case "$host_os" in
+      mingw*) REPLACE_GETTIMEOFDAY=1 ;;
+    esac
   fi
 
 cat >>confdefs.h <<_ACEOF
@@ -13751,31 +14095,7 @@ _ACEOF
 
   gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext"
 
-
-  for ac_header in sys/timeb.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_TIMEB_H 1
-_ACEOF
-
-fi
-
-done
-
-  for ac_func in _ftime
-do :
-  ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
-if test "x$ac_cv_func__ftime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__FTIME 1
-_ACEOF
-
-fi
-done
-
-
+    :
   fi
 
 
@@ -13793,6 +14113,9 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
+  :
+
+
 
 
 
@@ -14036,6 +14359,7 @@ $as_echo "#define HAVE_INLINE 1" >>confdefs.h
 
 
 
+
   LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
 
 
@@ -14282,6 +14606,17 @@ fi
 
 
 
+  gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext"
+
+
+
+
+
+
+
+
+
+
 
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
@@ -14327,7 +14662,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
         if (mbsinit (&state))
-          return 1;
+          return 2;
     }
   return 0;
 }
@@ -14394,7 +14729,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 3, 6, &state) != 4
           && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -14581,7 +14916,7 @@ int main ()
       mbrtowc (&wc, NULL, 5, &state);
       /* Check that wc was not modified.  */
       if (wc != (wchar_t) 0xBADFACE)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -14781,7 +15116,7 @@ int main ()
 
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, "", 1, &state) != 0)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -14844,6 +15179,60 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
 $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+
+int
+main ()
+{
+
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 2;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 3;
+              }
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_C_locale_sans_EILSEQ=yes
+else
+  gl_cv_C_locale_sans_EILSEQ=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5
+$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -14881,6 +15270,14 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
         *)
 $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
 
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *)
+$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+
            REPLACE_MBRTOWC=1
            ;;
       esac
@@ -14972,7 +15369,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
         if (mbsinit (&state))
-          return 1;
+          return 2;
     }
   return 0;
 }
@@ -15039,7 +15436,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 3, 6, &state) != 4
           && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -15194,7 +15591,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
         if (mbsinit (&state))
-          return 1;
+          return 2;
     }
   return 0;
 }
@@ -15261,7 +15658,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 3, 6, &state) != 4
           && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -15760,6 +16157,7 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
 
 
 
+  $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
 
 
@@ -16028,7 +16426,7 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
 
 
 
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
+    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
@@ -16122,11 +16520,17 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#ifdef __MVS__
+/* z/OS does not deliver signals while strstr() is running (thanks to
+   restrictions on its LE runtime), which prevents us from limiting the
+   running time of this test.  */
+# error "This test does not work properly on z/OS"
+#endif
 #include <signal.h> /* for signal */
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
+static void quit (int sig) { _exit (sig + 128); }
 
 int
 main ()
@@ -16384,14 +16788,14 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; }
 
 
 
+    WINDOWS_STAT_TIMESPEC=0
+
+
+
+
     WINDOWS_64_BIT_ST_SIZE=0
 
 
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-
-$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
-
-  fi
 
       ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
      #include <sys/stat.h>
@@ -16549,7 +16953,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
 
 
 
-    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
+    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat     truncate ttyname_r unlink unlinkat usleep; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
@@ -16826,7 +17230,9 @@ $as_echo "$gl_cv_next_wchar_h" >&6; }
 
 
 
-    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
+
+
+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime     ; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
@@ -16930,7 +17336,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
         if (mbsinit (&state))
-          return 1;
+          return 2;
     }
   return 0;
 }
@@ -16997,7 +17403,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 3, 6, &state) != 4
           && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
+        return 2;
     }
   return 0;
 }
@@ -17448,6 +17854,8 @@ $as_echo "#define GNULIB_TEST_WCTOMB 1" >>confdefs.h
 
 
 
+
+
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wctype_h='<'wctype.h'>'
      else
@@ -17892,6 +18300,127 @@ $as_echo "#define GNULIB_TEST_WMEMCPY 1" >>confdefs.h
 
 
 
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+
+
+
 # Check whether --with-ncurses was given.
 if test "${with_ncurses+set}" = set; then :
   withval=$with_ncurses;
@@ -17909,6 +18438,8 @@ fi
 
 
     ax_saved_LIBS=$LIBS
+    ax_saved_CPPFLAGS=$CPPFLAGS
+
     if test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes; then :
   ax_with_plaincurses=no
 else
@@ -17918,17 +18449,68 @@ fi
     ax_cv_curses_which=no
 
     # Test for NcursesW
+    if test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno; then :
 
-    if test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno; then :
 
-        LIBS="$ax_saved_LIBS -lncursesw"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncursesw via pkg-config" >&5
+$as_echo_n "checking for ncursesw via pkg-config... " >&6; }
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NcursesW wide-character library" >&5
-$as_echo_n "checking for NcursesW wide-character library... " >&6; }
+
+
+    if test -n "$_ax_cv_ncursesw_libs"; then
+    pkg_cv__ax_cv_ncursesw_libs="$_ax_cv_ncursesw_libs"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncursesw_libs=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+    if test -n "$_ax_cv_ncursesw_cppflags"; then
+    pkg_cv__ax_cv_ncursesw_cppflags="$_ax_cv_ncursesw_cppflags"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncursesw_cppflags=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+    if test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        # No suitable .pc file found, have to find flags via fallback
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncursesw via fallback" >&5
+$as_echo_n "checking for ncursesw via fallback... " >&6; }
 if ${ax_cv_ncursesw+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
+            $as_echo
+            pkg_cv__ax_cv_ncursesw_libs="-lncursesw"
+            pkg_cv__ax_cv_ncursesw_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncursesw_cppflags"
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for initscr() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17948,9 +18530,80 @@ return initscr ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_ncursesw=yes
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        ax_cv_ncursesw=yes
+
 else
-  ax_cv_ncursesw=no
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        pkg_cv__ax_cv_ncursesw_libs="$pkg_cv__ax_cv_ncursesw_libs -ltinfow"
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                            ax_cv_ncursesw=yes
+
+else
+
+                            ax_cv_ncursesw=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+else
+
+                    ax_cv_ncursesw=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -17958,6 +18611,19 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncursesw" >&5
 $as_echo "$ax_cv_ncursesw" >&6; }
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncursesw_cppflags"
+        ax_cv_ncursesw=yes
+
+fi
+
+
         if test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes; then :
 
             as_fn_error $? "--with-ncursesw specified but could not find NcursesW library" "$LINENO" 5
@@ -17968,7 +18634,8 @@ fi
 
             ax_cv_curses=yes
             ax_cv_curses_which=ncursesw
-            CURSES_LIB="-lncursesw"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
 
 $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
 
@@ -18178,19 +18845,72 @@ fi
 fi
 
 fi
+    unset pkg_cv__ax_cv_ncursesw_libs
+    unset pkg_cv__ax_cv_ncursesw_cppflags
 
     # Test for Ncurses
+    if test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno; then :
 
-    if test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno; then :
 
-        LIBS="$ax_saved_LIBS -lncurses"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncurses via pkg-config" >&5
+$as_echo_n "checking for ncurses via pkg-config... " >&6; }
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ncurses library" >&5
-$as_echo_n "checking for Ncurses library... " >&6; }
+
+
+    if test -n "$_ax_cv_ncurses_libs"; then
+    pkg_cv__ax_cv_ncurses_libs="$_ax_cv_ncurses_libs"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncurses_libs=`$PKG_CONFIG --libs "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+    if test -n "$_ax_cv_ncurses_cppflags"; then
+    pkg_cv__ax_cv_ncurses_cppflags="$_ax_cv_ncurses_cppflags"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncurses_cppflags=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+    if test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        # No suitable .pc file found, have to find flags via fallback
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncurses via fallback" >&5
+$as_echo_n "checking for ncurses via fallback... " >&6; }
 if ${ax_cv_ncurses+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
+            $as_echo
+            pkg_cv__ax_cv_ncurses_libs="-lncurses"
+            pkg_cv__ax_cv_ncurses_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncurses_cppflags"
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for initscr() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18210,9 +18930,81 @@ return initscr ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_ncurses=yes
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        ax_cv_ncurses=yes
+
 else
-  ax_cv_ncurses=no
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        pkg_cv__ax_cv_ncurses_libs="$pkg_cv__ax_cv_ncurses_libs -ltinfo"
+
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                            ax_cv_ncurses=yes
+
+else
+
+                            ax_cv_ncurses=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+else
+
+                    ax_cv_ncurses=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -18220,6 +19012,19 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncurses" >&5
 $as_echo "$ax_cv_ncurses" >&6; }
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncurses_cppflags"
+        ax_cv_ncurses=yes
+
+fi
+
+
         if test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes; then :
 
             as_fn_error $? "--with-ncurses specified but could not find Ncurses library" "$LINENO" 5
@@ -18230,7 +19035,8 @@ fi
 
             ax_cv_curses=yes
             ax_cv_curses_which=ncurses
-            CURSES_LIB="-lncurses"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
 
 $as_echo "#define HAVE_NCURSES 1" >>confdefs.h
 
@@ -18356,14 +19162,15 @@ fi
 fi
 
 fi
+    unset pkg_cv__ax_cv_ncurses_libs
+    unset pkg_cv__ax_cv_ncurses_cppflags
 
-    # Test for plain Curses (or if CURSES_LIB was set by user)
-
+    # Test for plain Curses (or if CURSES_LIBS was set by user)
     if test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno; then :
 
-        if test "x$CURSES_LIB" != x; then :
+        if test "x$CURSES_LIBS" != x; then :
 
-            LIBS="$ax_saved_LIBS $CURSES_LIB"
+            LIBS="$ax_saved_LIBS $CURSES_LIBS"
 
 else
 
@@ -18411,9 +19218,9 @@ $as_echo "$ax_cv_plaincurses" >&6; }
 
             ax_cv_curses=yes
             ax_cv_curses_which=plaincurses
-            if test "x$CURSES_LIB" = x; then :
+            if test "x$CURSES_LIBS" = x; then :
 
-                CURSES_LIB="-lcurses"
+                CURSES_LIBS="-lcurses"
 
 fi
 
@@ -18645,6 +19452,10 @@ fi
 fi
 
     LIBS=$ax_saved_LIBS
+    CPPFLAGS=$ax_saved_CPPFLAGS
+
+    unset ax_saved_LIBS
+    unset ax_saved_CPPFLAGS
 
 if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then :
 
@@ -18668,7 +19479,12 @@ $as_echo "$as_me: WARNING: no X/Open-compatible Enhanced Curses library found
 
 fi
 
-ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile doc/Makefile po/Makefile.in m4/Makefile"
+desktopdir='${datadir}/applications'
+
+iconsdir='${datadir}/icons/hicolor'
+
+
+ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile data/Makefile doc/Makefile po/Makefile.in m4/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18795,6 +19611,10 @@ else
   am__EXEEXT_FALSE=
 fi
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18820,6 +19640,10 @@ if test -z "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE
   as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then
+  as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
   as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18832,6 +19656,10 @@ if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FAL
   as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then
+  as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
   as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19273,7 +20101,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Star Traders $as_me 7.9, which was
+This file was extended by Star Traders $as_me 7.10-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19340,7 +20168,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Star Traders config.status 7.9
+Star Traders config.status 7.10-pre1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19482,6 +20310,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
diff --git a/data/Makefile.in b/data/Makefile.in
new file mode 100644
index 0000000..e3a6edd
--- /dev/null
+++ b/data/Makefile.in
@@ -0,0 +1,1528 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#########################################################################
+#                                                                       #
+#             Star Traders: A Game of Interstellar Trading              #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
+#                                                                       #
+#########################################################################
+
+# Author: John Zaitseff <J.Zaitseff@zap.org.au>
+# $Id: 46072f58b6d28544c7992ebd359e68464e468132 $
+#
+# This file, data/Makefile.am, contains the non-code data directory
+# Makefile for Star Traders.  It needs to be processed by automake to
+# produce the corresponding Makefile.in.
+#
+#
+# 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 3 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, see http://www.gnu.org/licenses/.
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+	$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/assert.m4 \
+	$(top_srcdir)/m4/ax_append_flag.m4 \
+	$(top_srcdir)/m4/ax_c___attribute__.m4 \
+	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
+	$(top_srcdir)/m4/ax_require_defined.m4 \
+	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
+	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libunistring-base.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
+	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
+	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
+	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wcsdup.m4 \
+	$(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \
+	$(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/wmemcpy.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_desktop_DATA) \
+	$(dist_icons128_DATA) $(dist_icons16_DATA) \
+	$(dist_icons22_DATA) $(dist_icons24_DATA) \
+	$(dist_icons256_DATA) $(dist_icons32_DATA) \
+	$(dist_icons48_DATA) $(dist_icons512_DATA) \
+	$(dist_icons64_DATA) $(dist_icons96_DATA) \
+	$(dist_iconsscalable_DATA) $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons128dir)" \
+	"$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \
+	"$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" \
+	"$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" \
+	"$(DESTDIR)$(icons512dir)" "$(DESTDIR)$(icons64dir)" \
+	"$(DESTDIR)$(icons96dir)" "$(DESTDIR)$(iconsscalabledir)"
+DATA = $(dist_desktop_DATA) $(dist_icons128_DATA) $(dist_icons16_DATA) \
+	$(dist_icons22_DATA) $(dist_icons24_DATA) \
+	$(dist_icons256_DATA) $(dist_icons32_DATA) \
+	$(dist_icons48_DATA) $(dist_icons512_DATA) \
+	$(dist_icons64_DATA) $(dist_icons96_DATA) \
+	$(dist_iconsscalable_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = @pkglibexecdir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
+GETOPT_H = @GETOPT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_ATOLL = @GNULIB_ATOLL@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
+GNULIB_CHOWN = @GNULIB_CHOWN@
+GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
+GNULIB_DPRINTF = @GNULIB_DPRINTF@
+GNULIB_DUP = @GNULIB_DUP@
+GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
+GNULIB_ENVIRON = @GNULIB_ENVIRON@
+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
+GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCLOSE = @GNULIB_FCLOSE@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FDOPEN = @GNULIB_FDOPEN@
+GNULIB_FFLUSH = @GNULIB_FFLUSH@
+GNULIB_FFSL = @GNULIB_FFSL@
+GNULIB_FFSLL = @GNULIB_FFSLL@
+GNULIB_FGETC = @GNULIB_FGETC@
+GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FOPEN = @GNULIB_FOPEN@
+GNULIB_FPRINTF = @GNULIB_FPRINTF@
+GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
+GNULIB_FPURGE = @GNULIB_FPURGE@
+GNULIB_FPUTC = @GNULIB_FPUTC@
+GNULIB_FPUTS = @GNULIB_FPUTS@
+GNULIB_FREAD = @GNULIB_FREAD@
+GNULIB_FREOPEN = @GNULIB_FREOPEN@
+GNULIB_FSCANF = @GNULIB_FSCANF@
+GNULIB_FSEEK = @GNULIB_FSEEK@
+GNULIB_FSEEKO = @GNULIB_FSEEKO@
+GNULIB_FSTAT = @GNULIB_FSTAT@
+GNULIB_FSTATAT = @GNULIB_FSTATAT@
+GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTELL = @GNULIB_FTELL@
+GNULIB_FTELLO = @GNULIB_FTELLO@
+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_FWRITE = @GNULIB_FWRITE@
+GNULIB_GETC = @GNULIB_GETC@
+GNULIB_GETCHAR = @GNULIB_GETCHAR@
+GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDELIM = @GNULIB_GETDELIM@
+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLINE = @GNULIB_GETLINE@
+GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
+GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_ICONV = @GNULIB_ICONV@
+GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
+GNULIB_LCHMOD = @GNULIB_LCHMOD@
+GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
+GNULIB_LSEEK = @GNULIB_LSEEK@
+GNULIB_LSTAT = @GNULIB_LSTAT@
+GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
+GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
+GNULIB_MBSCHR = @GNULIB_MBSCHR@
+GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSLEN = @GNULIB_MBSLEN@
+GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
+GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
+GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
+GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_MBSSEP = @GNULIB_MBSSEP@
+GNULIB_MBSSPN = @GNULIB_MBSSPN@
+GNULIB_MBSSTR = @GNULIB_MBSSTR@
+GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
+GNULIB_MEMCHR = @GNULIB_MEMCHR@
+GNULIB_MEMMEM = @GNULIB_MEMMEM@
+GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
+GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
+GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKFIFO = @GNULIB_MKFIFO@
+GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@
+GNULIB_MKNOD = @GNULIB_MKNOD@
+GNULIB_MKNODAT = @GNULIB_MKNODAT@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
+GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
+GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIB_PCLOSE = @GNULIB_PCLOSE@
+GNULIB_PERROR = @GNULIB_PERROR@
+GNULIB_PIPE = @GNULIB_PIPE@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POPEN = @GNULIB_POPEN@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PRINTF = @GNULIB_PRINTF@
+GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTC = @GNULIB_PUTC@
+GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
+GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PUTS = @GNULIB_PUTS@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
+GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
+GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
+GNULIB_READ = @GNULIB_READ@
+GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
+GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_REMOVE = @GNULIB_REMOVE@
+GNULIB_RENAME = @GNULIB_RENAME@
+GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
+GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SCANF = @GNULIB_SCANF@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
+GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
+GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
+GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
+GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
+GNULIB_STPCPY = @GNULIB_STPCPY@
+GNULIB_STPNCPY = @GNULIB_STPNCPY@
+GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
+GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
+GNULIB_STRDUP = @GNULIB_STRDUP@
+GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
+GNULIB_STRNCAT = @GNULIB_STRNCAT@
+GNULIB_STRNDUP = @GNULIB_STRNDUP@
+GNULIB_STRNLEN = @GNULIB_STRNLEN@
+GNULIB_STRPBRK = @GNULIB_STRPBRK@
+GNULIB_STRPTIME = @GNULIB_STRPTIME@
+GNULIB_STRSEP = @GNULIB_STRSEP@
+GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
+GNULIB_STRSTR = @GNULIB_STRSTR@
+GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLL = @GNULIB_STRTOLL@
+GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TIMEGM = @GNULIB_TIMEGM@
+GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
+GNULIB_TMPFILE = @GNULIB_TMPFILE@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
+GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
+GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
+GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
+GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
+GNULIB_VFSCANF = @GNULIB_VFSCANF@
+GNULIB_VPRINTF = @GNULIB_VPRINTF@
+GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
+GNULIB_VSCANF = @GNULIB_VSCANF@
+GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
+GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
+GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
+GREP = @GREP@
+HAVE_ATOLL = @HAVE_ATOLL@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
+HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
+HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
+HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
+HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
+HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
+HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
+HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
+HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
+HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
+HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DPRINTF = @HAVE_DPRINTF@
+HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHMODAT = @HAVE_FCHMODAT@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FFSL = @HAVE_FFSL@
+HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FSEEKO = @HAVE_FSEEKO@
+HAVE_FSTATAT = @HAVE_FSTATAT@
+HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTELLO = @HAVE_FTELLO@
+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
+HAVE_FUTIMENS = @HAVE_FUTIMENS@
+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
+HAVE_GETOPT_H = @HAVE_GETOPT_H@
+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
+HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
+HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LCHMOD = @HAVE_LCHMOD@
+HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSLEN = @HAVE_MBSLEN@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MEMCHR = @HAVE_MEMCHR@
+HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MKDIRAT = @HAVE_MKDIRAT@
+HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKFIFO = @HAVE_MKFIFO@
+HAVE_MKFIFOAT = @HAVE_MKFIFOAT@
+HAVE_MKNOD = @HAVE_MKNOD@
+HAVE_MKNODAT = @HAVE_MKNODAT@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
+HAVE_OS_H = @HAVE_OS_H@
+HAVE_PCLOSE = @HAVE_PCLOSE@
+HAVE_PIPE = @HAVE_PIPE@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POPEN = @HAVE_POPEN@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
+HAVE_RANDOM = @HAVE_RANDOM@
+HAVE_RANDOM_H = @HAVE_RANDOM_H@
+HAVE_RANDOM_R = @HAVE_RANDOM_R@
+HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
+HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
+HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RENAMEAT = @HAVE_RENAMEAT@
+HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
+HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_STPCPY = @HAVE_STPCPY@
+HAVE_STPNCPY = @HAVE_STPNCPY@
+HAVE_STRCASESTR = @HAVE_STRCASESTR@
+HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
+HAVE_STRPBRK = @HAVE_STRPBRK@
+HAVE_STRPTIME = @HAVE_STRPTIME@
+HAVE_STRSEP = @HAVE_STRSEP@
+HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLL = @HAVE_STRTOLL@
+HAVE_STRTOULL = @HAVE_STRTOULL@
+HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
+HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
+HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
+HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VASPRINTF = @HAVE_VASPRINTF@
+HAVE_VDPRINTF = @HAVE_VDPRINTF@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
+HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
+ICONV_CONST = @ICONV_CONST@
+ICONV_H = @ICONV_H@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR = @LOCALE_FR@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
+LOCALE_JA = @LOCALE_JA@
+LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
+NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
+NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
+NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_GETOPT_H = @NEXT_GETOPT_H@
+NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
+NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDIO_H = @NEXT_STDIO_H@
+NEXT_STDLIB_H = @NEXT_STDLIB_H@
+NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
+NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
+NEXT_TIME_H = @NEXT_TIME_H@
+NEXT_UNISTD_H = @NEXT_UNISTD_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CHOWN = @REPLACE_CHOWN@
+REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
+REPLACE_DPRINTF = @REPLACE_DPRINTF@
+REPLACE_DUP = @REPLACE_DUP@
+REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCLOSE = @REPLACE_FCLOSE@
+REPLACE_FDOPEN = @REPLACE_FDOPEN@
+REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FOPEN = @REPLACE_FOPEN@
+REPLACE_FPRINTF = @REPLACE_FPRINTF@
+REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREOPEN = @REPLACE_FREOPEN@
+REPLACE_FSEEK = @REPLACE_FSEEK@
+REPLACE_FSEEKO = @REPLACE_FSEEKO@
+REPLACE_FSTAT = @REPLACE_FSTAT@
+REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTELL = @REPLACE_FTELL@
+REPLACE_FTELLO = @REPLACE_FTELLO@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
+REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
+REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDELIM = @REPLACE_GETDELIM@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_ICONV = @REPLACE_ICONV@
+REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
+REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
+REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_LSTAT = @REPLACE_LSTAT@
+REPLACE_MALLOC = @REPLACE_MALLOC@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MEMCHR = @REPLACE_MEMCHR@
+REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MKDIR = @REPLACE_MKDIR@
+REPLACE_MKFIFO = @REPLACE_MKFIFO@
+REPLACE_MKNOD = @REPLACE_MKNOD@
+REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
+REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_POPEN = @REPLACE_POPEN@
+REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PRINTF = @REPLACE_PRINTF@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
+REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_REMOVE = @REPLACE_REMOVE@
+REPLACE_RENAME = @REPLACE_RENAME@
+REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
+REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
+REPLACE_SPRINTF = @REPLACE_SPRINTF@
+REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
+REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPNCPY = @REPLACE_STPNCPY@
+REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
+REPLACE_STRDUP = @REPLACE_STRDUP@
+REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
+REPLACE_STRNCAT = @REPLACE_STRNCAT@
+REPLACE_STRNDUP = @REPLACE_STRNDUP@
+REPLACE_STRNLEN = @REPLACE_STRNLEN@
+REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
+REPLACE_STRSTR = @REPLACE_STRSTR@
+REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
+REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TMPFILE = @REPLACE_TMPFILE@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
+REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
+REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
+REPLACE_VPRINTF = @REPLACE_VPRINTF@
+REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
+REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WRITE = @REPLACE_WRITE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
+TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
+UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
+WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+desktopdir = @desktopdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+gltests_LIBOBJS = @gltests_LIBOBJS@
+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+iconsdir = @iconsdir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+lispdir = @lispdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_desktop_DATA = trader.desktop
+icons16dir = ${iconsdir}/16x16/apps
+icons22dir = ${iconsdir}/22x22/apps
+icons24dir = ${iconsdir}/24x24/apps
+icons32dir = ${iconsdir}/32x32/apps
+icons48dir = ${iconsdir}/48x48/apps
+icons64dir = ${iconsdir}/64x64/apps
+icons96dir = ${iconsdir}/96x96/apps
+icons128dir = ${iconsdir}/128x128/apps
+icons256dir = ${iconsdir}/256x256/apps
+icons512dir = ${iconsdir}/512x512/apps
+iconsscalabledir = ${iconsdir}/scalable/apps
+dist_icons16_DATA = icons-16/trader.png
+dist_icons22_DATA = icons-22/trader.png
+dist_icons24_DATA = icons-24/trader.png
+dist_icons32_DATA = icons-32/trader.png
+dist_icons48_DATA = icons-48/trader.png
+dist_icons64_DATA = icons-64/trader.png
+dist_icons96_DATA = icons-96/trader.png
+dist_icons128_DATA = icons-128/trader.png
+dist_icons256_DATA = icons-256/trader.png
+dist_icons512_DATA = icons-512/trader.png
+dist_iconsscalable_DATA = trader.svg
+EXTRA_DIST = \
+	README			\
+	trader.desktop.in
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign data/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-dist_desktopDATA: $(dist_desktop_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+	done
+
+uninstall-dist_desktopDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_icons128DATA: $(dist_icons128_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons128_DATA)'; test -n "$(icons128dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons128dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons128dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons128dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons128dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons128DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons128_DATA)'; test -n "$(icons128dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons128dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons16DATA: $(dist_icons16_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons16_DATA)'; test -n "$(icons16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons16dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons16dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons16dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons16DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons16_DATA)'; test -n "$(icons16dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons16dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons22DATA: $(dist_icons22_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons22_DATA)'; test -n "$(icons22dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons22dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons22dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons22dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons22dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons22DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons22_DATA)'; test -n "$(icons22dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons22dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons24DATA: $(dist_icons24_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons24_DATA)'; test -n "$(icons24dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons24dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons24dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons24dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons24dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons24DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons24_DATA)'; test -n "$(icons24dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons24dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons256DATA: $(dist_icons256_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons256_DATA)'; test -n "$(icons256dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons256dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons256dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons256dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons256dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons256DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons256_DATA)'; test -n "$(icons256dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons256dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons32DATA: $(dist_icons32_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons32_DATA)'; test -n "$(icons32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons32dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons32dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons32dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons32DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons32_DATA)'; test -n "$(icons32dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons32dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons48DATA: $(dist_icons48_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons48_DATA)'; test -n "$(icons48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons48dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons48dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons48dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons48DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons48_DATA)'; test -n "$(icons48dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons48dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons512DATA: $(dist_icons512_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons512_DATA)'; test -n "$(icons512dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons512dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons512dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons512dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons512dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons512DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons512_DATA)'; test -n "$(icons512dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons512dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons64DATA: $(dist_icons64_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons64_DATA)'; test -n "$(icons64dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons64dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons64dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons64dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons64dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons64DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons64_DATA)'; test -n "$(icons64dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons64dir)'; $(am__uninstall_files_from_dir)
+install-dist_icons96DATA: $(dist_icons96_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_icons96_DATA)'; test -n "$(icons96dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icons96dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icons96dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons96dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icons96dir)" || exit $$?; \
+	done
+
+uninstall-dist_icons96DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icons96_DATA)'; test -n "$(icons96dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(icons96dir)'; $(am__uninstall_files_from_dir)
+install-dist_iconsscalableDATA: $(dist_iconsscalable_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_iconsscalable_DATA)'; test -n "$(iconsscalabledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsscalabledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsscalabledir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsscalabledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsscalabledir)" || exit $$?; \
+	done
+
+uninstall-dist_iconsscalableDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_iconsscalable_DATA)'; test -n "$(iconsscalabledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(iconsscalabledir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons128dir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons512dir)" "$(DESTDIR)$(icons64dir)" "$(DESTDIR)$(icons96dir)" "$(DESTDIR)$(iconsscalabledir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_desktopDATA install-dist_icons128DATA \
+	install-dist_icons16DATA install-dist_icons22DATA \
+	install-dist_icons24DATA install-dist_icons256DATA \
+	install-dist_icons32DATA install-dist_icons48DATA \
+	install-dist_icons512DATA install-dist_icons64DATA \
+	install-dist_icons96DATA install-dist_iconsscalableDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_desktopDATA uninstall-dist_icons128DATA \
+	uninstall-dist_icons16DATA uninstall-dist_icons22DATA \
+	uninstall-dist_icons24DATA uninstall-dist_icons256DATA \
+	uninstall-dist_icons32DATA uninstall-dist_icons48DATA \
+	uninstall-dist_icons512DATA uninstall-dist_icons64DATA \
+	uninstall-dist_icons96DATA uninstall-dist_iconsscalableDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_desktopDATA \
+	install-dist_icons128DATA install-dist_icons16DATA \
+	install-dist_icons22DATA install-dist_icons24DATA \
+	install-dist_icons256DATA install-dist_icons32DATA \
+	install-dist_icons48DATA install-dist_icons512DATA \
+	install-dist_icons64DATA install-dist_icons96DATA \
+	install-dist_iconsscalableDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-dist_desktopDATA uninstall-dist_icons128DATA \
+	uninstall-dist_icons16DATA uninstall-dist_icons22DATA \
+	uninstall-dist_icons24DATA uninstall-dist_icons256DATA \
+	uninstall-dist_icons32DATA uninstall-dist_icons48DATA \
+	uninstall-dist_icons512DATA uninstall-dist_icons64DATA \
+	uninstall-dist_icons96DATA uninstall-dist_iconsscalableDATA
+
+.PRECIOUS: Makefile
+
+
+trader.desktop: trader.desktop.in
+	$(top_srcdir)/build-aux/msgfmt-desktop -d $(top_srcdir)/po $< $@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 03d4c1b..eeabb5c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -17,12 +17,12 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
 # Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id: Makefile.am 663 2016-01-04 22:25:51Z john $
+# $Id: d327088affc02929d70a6b728e1255b51ce74f3f $
 #
 # This file, doc/Makefile.am, contains the documentation directory
 # Makefile for Star Traders.  It needs to be processed by automake to
@@ -123,32 +123,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \
-	$(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
-	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
-	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
-	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \
-	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ssize_t.m4 \
-	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
-	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -238,7 +242,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -247,6 +252,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
@@ -259,6 +265,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
@@ -325,6 +332,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -366,6 +374,8 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
 GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
@@ -414,6 +424,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -435,7 +446,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
@@ -465,6 +478,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
 GNULIB_WCSCPY = @GNULIB_WCSCPY@
 GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
 GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
 GNULIB_WCSLEN = @GNULIB_WCSLEN@
 GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
 GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
@@ -495,8 +509,10 @@ GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
@@ -507,6 +523,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
@@ -596,6 +613,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -629,6 +647,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
@@ -636,6 +655,8 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
@@ -657,6 +678,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@
 HAVE_WCSCPY = @HAVE_WCSCPY@
 HAVE_WCSCSPN = @HAVE_WCSCSPN@
 HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
 HAVE_WCSLEN = @HAVE_WCSLEN@
 HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
 HAVE_WCSNCAT = @HAVE_WCSNCAT@
@@ -705,6 +727,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
@@ -713,6 +736,7 @@ LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
@@ -720,6 +744,7 @@ MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -735,6 +760,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -757,6 +783,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -768,6 +797,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -863,6 +893,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -877,7 +908,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
@@ -890,6 +923,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
@@ -917,6 +951,8 @@ VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -925,7 +961,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -941,6 +976,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+desktopdir = @desktopdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -955,6 +991,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+iconsdir = @iconsdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -984,7 +1021,7 @@ EXTRA_DIST = README
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1008,9 +1045,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-man6: $(dist_man6_MANS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4879c1a..307fe2a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ MOSTLYCLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
+# No GNU Make output.
 
 AM_CPPFLAGS =
 AM_CFLAGS =
@@ -133,11 +134,11 @@ EXTRA_DIST += crc.h
 
 ## begin gnulib module getopt-posix
 
-BUILT_SOURCES += $(GETOPT_H)
+BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H)
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(top_builddir)/config.status
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -150,9 +151,18 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
 	      < $(srcdir)/getopt.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
-MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
+getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
+	      < $(srcdir)/getopt-cdefs.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+
+MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t
+
+EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h
 
 EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
@@ -199,6 +209,14 @@ V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## end   gnulib module gperf
 
+## begin gnulib module hard-locale
+
+libgnu_a_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end   gnulib module hard-locale
+
 ## begin gnulib module havelib
 
 
@@ -270,6 +288,34 @@ EXTRA_libgnu_a_SOURCES += iconv.c iconv_close.c iconv_open.c
 
 ## end   gnulib module iconv_open
 
+## begin gnulib module limits-h
+
+BUILT_SOURCES += $(LIMITS_H)
+
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+if GL_GENERATE_LIMITS_H
+limits.h: limits.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+	      < $(srcdir)/limits.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+limits.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += limits.h limits.h-t
+
+EXTRA_DIST += limits.in.h
+
+## end   gnulib module limits-h
+
 ## begin gnulib module localcharset
 
 libgnu_a_SOURCES += localcharset.h localcharset.c
@@ -379,6 +425,15 @@ EXTRA_DIST += locale.in.h
 
 ## end   gnulib module locale
 
+## begin gnulib module localtime-buffer
+
+
+EXTRA_DIST += localtime-buffer.c localtime-buffer.h
+
+EXTRA_libgnu_a_SOURCES += localtime-buffer.c
+
+## end   gnulib module localtime-buffer
+
 ## begin gnulib module mbrtowc
 
 
@@ -427,106 +482,60 @@ EXTRA_libgnu_a_SOURCES += memchr.c
 ## begin gnulib module snippet/_Noreturn
 
 # Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
+# gnulib Makefile snippets, it must be present in all makefiles that
 # need it. This is ensured by the applicability 'all' defined above.
 
-_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h
+_NORETURN_H=$(srcdir)/_Noreturn.h
 
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h
+EXTRA_DIST += _Noreturn.h
 
 ## end   gnulib module snippet/_Noreturn
 
 ## begin gnulib module snippet/arg-nonnull
 
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
 
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+ARG_NONNULL_H=$(srcdir)/arg-nonnull.h
 
-ARG_NONNULL_H=arg-nonnull.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h
+EXTRA_DIST += arg-nonnull.h
 
 ## end   gnulib module snippet/arg-nonnull
 
 ## begin gnulib module snippet/c++defs
 
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
 
-BUILT_SOURCES += c++defs.h
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+CXXDEFS_H=$(srcdir)/c++defs.h
 
-CXXDEFS_H=c++defs.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h
+EXTRA_DIST += c++defs.h
 
 ## end   gnulib module snippet/c++defs
 
 ## begin gnulib module snippet/unused-parameter
 
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
 
-BUILT_SOURCES += unused-parameter.h
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t
+UNUSED_PARAMETER_H=$(srcdir)/unused-parameter.h
 
-UNUSED_PARAMETER_H=unused-parameter.h
-
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h
+EXTRA_DIST += unused-parameter.h
 
 ## end   gnulib module snippet/unused-parameter
 
 ## begin gnulib module snippet/warn-on-use
 
-BUILT_SOURCES += warn-on-use.h
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
 
-WARN_ON_USE_H=warn-on-use.h
+WARN_ON_USE_H=$(srcdir)/warn-on-use.h
 
-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h
+EXTRA_DIST += warn-on-use.h
 
 ## end   gnulib module snippet/warn-on-use
 
@@ -600,6 +609,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
@@ -621,6 +631,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status
 	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
 	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
 	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 	      < $(srcdir)/stdint.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -825,6 +836,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
 	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
 	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
@@ -1013,6 +1025,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
 	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
+	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
 	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
 	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
 	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
@@ -1026,6 +1039,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
 	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
 	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -1109,6 +1123,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
 	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
 	      < $(srcdir)/sys_types.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -1132,24 +1147,31 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+	      -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \
+	      -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \
 	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
 	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
+	      -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \
 	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
 	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
 	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
 	      -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \
+	      -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \
 	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
 	      -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \
+	      -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \
+	      -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \
 	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+	      -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
 	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
 	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
@@ -1224,6 +1246,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
+	      -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \
 	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
 	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
 	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
@@ -1246,7 +1269,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
-	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
@@ -1262,12 +1284,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
 	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
 	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
 	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
@@ -1302,6 +1326,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
+	      -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \
 	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
 	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
 	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
@@ -1391,6 +1416,8 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
 	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
 	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
@@ -1430,6 +1457,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
 	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
 	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+	      -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
 	      < $(srcdir)/wchar.in.h | \
 	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
@@ -1469,6 +1497,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
 	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
 	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
+	      -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	  | \
@@ -1485,6 +1514,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
@@ -1548,6 +1578,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
 	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
 	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 543e6fc..6f8f36a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -123,32 +123,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \
-	$(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
-	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
-	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
-	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \
-	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ssize_t.m4 \
-	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
-	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -173,18 +177,19 @@ am__v_AR_1 =
 libgnu_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
 am__libgnu_a_SOURCES_DIST = c-ctype.h c-ctype.c c-strcase.h \
-	c-strcasecmp.c c-strncasecmp.c crc.c gettext.h localcharset.h \
-	localcharset.c striconv.h striconv.c strnlen1.h strnlen1.c \
-	unistd.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \
+	c-strcasecmp.c c-strncasecmp.c crc.c gettext.h hard-locale.c \
+	localcharset.h localcharset.c striconv.h striconv.c strnlen1.h \
+	strnlen1.c unistd.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \
 	unistr/u8-uctomb-aux.c wctype-h.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT)
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/u8-uctomb-aux.$(OBJEXT)
 am_libgnu_a_OBJECTS = c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \
-	c-strncasecmp.$(OBJEXT) crc.$(OBJEXT) localcharset.$(OBJEXT) \
-	striconv.$(OBJEXT) strnlen1.$(OBJEXT) unistd.$(OBJEXT) \
-	$(am__objects_1) $(am__objects_2) wctype-h.$(OBJEXT)
+	c-strncasecmp.$(OBJEXT) crc.$(OBJEXT) hard-locale.$(OBJEXT) \
+	localcharset.$(OBJEXT) striconv.$(OBJEXT) strnlen1.$(OBJEXT) \
+	unistd.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+	wctype-h.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -308,7 +313,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -317,6 +323,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
@@ -329,6 +336,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
@@ -395,6 +403,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -436,6 +445,8 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
 GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
@@ -484,6 +495,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -505,7 +517,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
@@ -535,6 +549,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
 GNULIB_WCSCPY = @GNULIB_WCSCPY@
 GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
 GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
 GNULIB_WCSLEN = @GNULIB_WCSLEN@
 GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
 GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
@@ -565,8 +580,10 @@ GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
@@ -577,6 +594,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
@@ -666,6 +684,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -699,6 +718,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
@@ -706,6 +726,8 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
@@ -727,6 +749,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@
 HAVE_WCSCPY = @HAVE_WCSCPY@
 HAVE_WCSCSPN = @HAVE_WCSCSPN@
 HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
 HAVE_WCSLEN = @HAVE_WCSLEN@
 HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
 HAVE_WCSNCAT = @HAVE_WCSNCAT@
@@ -775,6 +798,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
@@ -783,6 +807,7 @@ LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
@@ -790,6 +815,7 @@ MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -805,6 +831,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -827,6 +854,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -838,6 +868,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -933,6 +964,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -947,7 +979,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
@@ -960,6 +994,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
@@ -987,6 +1022,8 @@ VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -995,7 +1032,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -1011,6 +1047,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+desktopdir = @desktopdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -1025,6 +1062,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+iconsdir = @iconsdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -1065,79 +1103,64 @@ noinst_LTLIBRARIES =
 # enabled by default because the intl directory might not exist if
 # your project does not use "gettext --intl", and some compilers
 # complain about -I options applied to nonexistent directories.
-EXTRA_DIST = btowc.c crc.h getopt.c getopt.in.h getopt1.c getopt_int.h \
+EXTRA_DIST = btowc.c crc.h getopt-cdefs.in.h getopt-core.h \
+	getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c \
+	getopt.in.h getopt1.c getopt_int.h \
 	$(top_srcdir)/build-aux/config.rpath gettimeofday.c \
-	$(top_srcdir)/build-aux/config.rpath iconv.in.h \
+	hard-locale.h $(top_srcdir)/build-aux/config.rpath iconv.in.h \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
 	iconv_open-aix.gperf iconv_open-hpux.gperf \
 	iconv_open-irix.gperf iconv_open-osf.gperf \
-	iconv_open-solaris.gperf iconv_open.c config.charset \
-	ref-add.sin ref-del.sin locale.in.h mbrtowc.c mbsinit.c \
+	iconv_open-solaris.gperf iconv_open.c limits.in.h \
+	config.charset ref-add.sin ref-del.sin locale.in.h \
+	localtime-buffer.c localtime-buffer.h mbrtowc.c mbsinit.c \
 	mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h \
-	mbtowc.c memchr.c memchr.valgrind \
-	$(top_srcdir)/build-aux/snippet/_Noreturn.h \
-	$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
-	$(top_srcdir)/build-aux/snippet/c++defs.h \
-	$(top_srcdir)/build-aux/snippet/unused-parameter.h \
-	$(top_srcdir)/build-aux/snippet/warn-on-use.h stdbool.in.h \
+	mbtowc.c memchr.c memchr.valgrind _Noreturn.h arg-nonnull.h \
+	c++defs.h unused-parameter.h warn-on-use.h stdbool.in.h \
 	stddef.in.h stdint.in.h stdio.in.h stdlib.in.h streq.h \
 	string.in.h str-two-way.h strstr.c sys_stat.in.h sys_time.in.h \
 	sys_types.in.h time.in.h unistd.in.h unistr.in.h unitypes.in.h \
 	verify.h wchar.in.h wcrtomb.c wcsdup-impl.h wcsdup.c wctob.c \
 	wctomb-impl.h wctomb.c wctype.in.h wmemcpy-impl.h wmemcpy.c
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-BUILT_SOURCES = configmake.h $(GETOPT_H) $(ICONV_H) iconv_open-aix.h \
-	iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h \
-	iconv_open-solaris.h locale.h arg-nonnull.h c++defs.h \
-	unused-parameter.h warn-on-use.h $(STDBOOL_H) $(STDDEF_H) \
-	$(STDINT_H) stdio.h stdlib.h string.h sys/stat.h sys/time.h \
-	sys/types.h time.h unistd.h $(LIBUNISTRING_UNISTR_H) \
-	$(LIBUNISTRING_UNITYPES_H) wchar.h wctype.h
+BUILT_SOURCES = configmake.h $(GETOPT_H) $(GETOPT_CDEFS_H) $(ICONV_H) \
+	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
+	iconv_open-osf.h iconv_open-solaris.h $(LIMITS_H) locale.h \
+	$(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \
+	sys/stat.h sys/time.h sys/types.h time.h unistd.h \
+	$(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) wchar.h \
+	wctype.h
 SUFFIXES = .sed .sin
-MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t iconv.h \
-	iconv.h-t iconv_open-aix.h-t iconv_open-hpux.h-t \
-	iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t \
-	locale.h locale.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h \
-	c++defs.h-t unused-parameter.h unused-parameter.h-t \
-	warn-on-use.h warn-on-use.h-t stdbool.h stdbool.h-t stddef.h \
-	stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h \
-	stdlib.h-t string.h string.h-t sys/stat.h sys/stat.h-t \
-	sys/time.h sys/time.h-t sys/types.h sys/types.h-t time.h \
-	time.h-t unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \
-	unitypes.h-t wchar.h wchar.h-t wctype.h wctype.h-t
+MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t getopt-cdefs.h \
+	getopt-cdefs.h-t iconv.h iconv.h-t iconv_open-aix.h-t \
+	iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t \
+	iconv_open-solaris.h-t limits.h limits.h-t locale.h locale.h-t \
+	stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t \
+	stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \
+	sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t sys/types.h \
+	sys/types.h-t time.h time.h-t unistd.h unistd.h-t unistr.h \
+	unistr.h-t unitypes.h unitypes.h-t wchar.h wchar.h-t wctype.h \
+	wctype.h-t
 MOSTLYCLEANDIRS = sys
 CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
 	ref-del.sed
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \
 	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+# No GNU Make output.
 AM_CPPFLAGS = 
 AM_CFLAGS = 
 libgnu_a_SOURCES = c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \
-	c-strncasecmp.c crc.c gettext.h localcharset.h localcharset.c \
-	striconv.h striconv.c strnlen1.h strnlen1.c unistd.c \
-	$(am__append_1) $(am__append_2) wctype-h.c
+	c-strncasecmp.c crc.c gettext.h hard-locale.c localcharset.h \
+	localcharset.c striconv.h striconv.c strnlen1.h strnlen1.c \
+	unistd.c $(am__append_1) $(am__append_2) wctype-h.c
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES = btowc.c getopt.c getopt1.c gettimeofday.c \
-	iconv.c iconv_close.c iconv_open.c mbrtowc.c mbsinit.c \
-	mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c strstr.c \
-	wcrtomb.c wcsdup.c wctob.c wctomb.c wmemcpy.c
+	iconv.c iconv_close.c iconv_open.c localtime-buffer.c \
+	mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c \
+	memchr.c strstr.c wcrtomb.c wcsdup.c wctob.c wctomb.c \
+	wmemcpy.c
 
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
@@ -1151,19 +1174,35 @@ charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 
 # Because this Makefile snippet defines a variable used by other
-# gnulib Makefile snippets, it must be present in all Makefile.am that
+# gnulib Makefile snippets, it must be present in all makefiles that
 # need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
-UNUSED_PARAMETER_H = unused-parameter.h
-WARN_ON_USE_H = warn-on-use.h
+_NORETURN_H = $(srcdir)/_Noreturn.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+ARG_NONNULL_H = $(srcdir)/arg-nonnull.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+CXXDEFS_H = $(srcdir)/c++defs.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+UNUSED_PARAMETER_H = $(srcdir)/unused-parameter.h
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all makefiles that
+# need it. This is ensured by the applicability 'all' defined above.
+WARN_ON_USE_H = $(srcdir)/warn-on-use.h
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .sed .sin .c .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1187,9 +1226,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
@@ -1239,10 +1278,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv_close.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv_open.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs-state.Po@am__quote@
@@ -1609,7 +1650,7 @@ configmake.h: Makefile
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(top_builddir)/config.status
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -1623,6 +1664,14 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
 	} > $@-t && \
 	mv -f $@-t $@
 
+getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
+	      < $(srcdir)/getopt-cdefs.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
 @GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@@ -1663,6 +1712,22 @@ iconv_open-solaris.h: iconv_open-solaris.gperf
 	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \
 	mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
 
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_LIMITS_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@GL_GENERATE_LIMITS_H_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+@GL_GENERATE_LIMITS_H_TRUE@	      < $(srcdir)/limits.in.h; \
+@GL_GENERATE_LIMITS_H_TRUE@	} > $@-t && \
+@GL_GENERATE_LIMITS_H_TRUE@	mv $@-t $@
+@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status
+@GL_GENERATE_LIMITS_H_FALSE@	rm -f $@
+
 # We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
 # packages so that "make uninstall" will remove the file if and only if it
@@ -1747,41 +1812,6 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      < $(srcdir)/locale.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
-# off.
-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/c++defs.h \
-	  > $@-t && \
-	mv $@-t $@
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/snippet/unused-parameter.h, except that it has the copyright
-# header cut off.
-unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/unused-parameter.h \
-	  > $@-t && \
-	mv $@-t $@
-# The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
-# off.
-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/build-aux/snippet/warn-on-use.h \
-	  > $@-t && \
-	mv $@-t $@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
@@ -1824,6 +1854,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
@@ -1845,6 +1876,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+@GL_GENERATE_STDINT_H_TRUE@	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 @GL_GENERATE_STDINT_H_TRUE@	      < $(srcdir)/stdint.in.h; \
 @GL_GENERATE_STDINT_H_TRUE@	} > $@-t && \
 @GL_GENERATE_STDINT_H_TRUE@	mv $@-t $@
@@ -2029,6 +2061,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
 	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
 	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
@@ -2169,6 +2202,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
 	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
+	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
 	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
 	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
 	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
@@ -2182,6 +2216,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
 	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
 	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
 	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
 	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
 	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
@@ -2246,6 +2281,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
 	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
 	      < $(srcdir)/sys_types.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -2260,24 +2296,31 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+	      -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \
+	      -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \
 	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
 	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
+	      -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \
 	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
 	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \
 	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \
 	      -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \
+	      -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \
 	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
 	      -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \
+	      -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \
+	      -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \
 	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+	      -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
 	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
 	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
@@ -2342,6 +2385,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
+	      -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \
 	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
 	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
 	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
@@ -2364,7 +2408,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
-	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
@@ -2380,12 +2423,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
 	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
 	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
 	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
+	      -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
@@ -2420,6 +2465,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
+	      -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \
 	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
 	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
 	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
@@ -2459,6 +2505,8 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
 	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 	      -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
 	      -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
 	      -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
@@ -2498,6 +2546,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
 	      -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
 	      -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+	      -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
 	      < $(srcdir)/wchar.in.h | \
 	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
@@ -2537,6 +2586,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
 	      -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
 	      -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
+	      -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	  | \
@@ -2553,6 +2603,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
+	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
@@ -2570,6 +2621,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \
 	      -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
 	      -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
 	      -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h
new file mode 100644
index 0000000..c44ad89
--- /dev/null
+++ b/lib/_Noreturn.h
@@ -0,0 +1,10 @@
+#if !defined _Noreturn && __STDC_VERSION__ < 201112
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
+      || 0x5110 <= __SUNPRO_C)
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif
diff --git a/lib/btowc.c b/lib/btowc.c
index e7badf9..214d2b7 100644
--- a/lib/btowc.c
+++ b/lib/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index 717ae78..bcdba6b 100644
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2017 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -115,16 +115,16 @@ extern "C" {
 
 /* Cases for lowercase hex letters, and lowercase letters, all offset by N.  */
 
-#define _C_CTYPE_LOWER_A_THRU_F_N(n) \
-   case 'a' + (n): case 'b' + (n): case 'c' + (n): case 'd' + (n): \
-   case 'e' + (n): case 'f' + (n)
-#define _C_CTYPE_LOWER_N(n) \
-   _C_CTYPE_LOWER_A_THRU_F_N(n): \
-   case 'g' + (n): case 'h' + (n): case 'i' + (n): case 'j' + (n): \
-   case 'k' + (n): case 'l' + (n): case 'm' + (n): case 'n' + (n): \
-   case 'o' + (n): case 'p' + (n): case 'q' + (n): case 'r' + (n): \
-   case 's' + (n): case 't' + (n): case 'u' + (n): case 'v' + (n): \
-   case 'w' + (n): case 'x' + (n): case 'y' + (n): case 'z' + (n)
+#define _C_CTYPE_LOWER_A_THRU_F_N(N) \
+   case 'a' + (N): case 'b' + (N): case 'c' + (N): case 'd' + (N): \
+   case 'e' + (N): case 'f' + (N)
+#define _C_CTYPE_LOWER_N(N) \
+   _C_CTYPE_LOWER_A_THRU_F_N(N): \
+   case 'g' + (N): case 'h' + (N): case 'i' + (N): case 'j' + (N): \
+   case 'k' + (N): case 'l' + (N): case 'm' + (N): case 'n' + (N): \
+   case 'o' + (N): case 'p' + (N): case 'q' + (N): case 'r' + (N): \
+   case 's' + (N): case 't' + (N): case 'u' + (N): case 'v' + (N): \
+   case 'w' + (N): case 'x' + (N): case 'y' + (N): case 'z' + (N)
 
 /* Cases for hex letters, digits, lower, punct, and upper.  */
 
diff --git a/lib/c-strcase.h b/lib/c-strcase.h
index 7e570f5..c82dab1 100644
--- a/lib/c-strcase.h
+++ b/lib/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2017 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index bd113b7..5bce873 100644
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index c316929..ada62d7 100644
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/config.charset b/lib/config.charset
index 947d916..8bedbf3 100644
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2016 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2017 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/lib/crc.c b/lib/crc.c
index 47bb176..c43192c 100644
--- a/lib/crc.c
+++ b/lib/crc.c
@@ -1,5 +1,5 @@
 /* crc.c -- cyclic redundancy checks
-   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/crc.h b/lib/crc.h
index 89b7bef..0f60f4f 100644
--- a/lib/crc.h
+++ b/lib/crc.h
@@ -1,5 +1,5 @@
 /* crc.h -- cyclic redundancy checks
-   Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h
new file mode 100644
index 0000000..c71a4f1
--- /dev/null
+++ b/lib/getopt-cdefs.in.h
@@ -0,0 +1,67 @@
+/* getopt-on-non-glibc compatibility macros.
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of gnulib.
+   Unlike most of the getopt implementation, it is NOT shared
+   with the GNU C Library.
+
+   gnulib 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 3 of
+   the License, or (at your option) any later version.
+
+   gnulib 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 gnulib; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_CDEFS_H
+#define _GETOPT_CDEFS_H 1
+
+/* This header should not be used directly; include getopt.h or
+   unistd.h instead.  It does not have a protective #error, because
+   the guard macro for getopt.h in gnulib is not fixed.  */
+
+/* getopt-core.h and getopt-ext.h are shared with GNU libc, and expect
+   a number of the internal macros supplied to GNU libc's headers by
+   sys/cdefs.h.  Provide fallback definitions for all of them.  */
+#if @HAVE_SYS_CDEFS_H@
+# include <sys/cdefs.h>
+#endif
+
+#ifndef __BEGIN_DECLS
+# ifdef __cplusplus
+#  define __BEGIN_DECLS extern "C" {
+# else
+#  define __BEGIN_DECLS /* nothing */
+# endif
+#endif
+#ifndef __END_DECLS
+# ifdef __cplusplus
+#  define __END_DECLS }
+# else
+#  define __END_DECLS /* nothing */
+# endif
+#endif
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_VERSION__
+# define __GNUC_PREREQ(maj, min) \
+        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW       throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#endif /* _GETOPT_CDEFS_H */
diff --git a/lib/getopt-core.h b/lib/getopt-core.h
new file mode 100644
index 0000000..d315891
--- /dev/null
+++ b/lib/getopt-core.h
@@ -0,0 +1,96 @@
+/* Declarations for getopt (basic, portable features only).
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
+
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
+
+   The GNU C Library 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 the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_CORE_H
+#define _GETOPT_CORE_H 1
+
+/* This header should not be used directly; include getopt.h or
+   unistd.h instead.  Unlike most bits headers, it does not have
+   a protective #error, because the guard macro for getopt.h in
+   gnulib is not fixed.  */
+
+__BEGIN_DECLS
+
+/* For communication from 'getopt' to the caller.
+   When 'getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when 'ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to 'getopt'.
+
+   On entry to 'getopt', zero means this is the first call; initialize.
+
+   When 'getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, 'optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message 'getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, 'optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in 'optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU 'getopt'.
+
+   The argument '--' causes premature termination of argument
+   scanning, explicitly telling 'getopt' that there are no more
+   options.
+
+   If OPTS begins with '-', then non-option arguments are treated as
+   arguments to the option '\1'.  This behavior is specific to the GNU
+   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
+   the environment, then do not permute arguments.
+
+   For standards compliance, the 'argv' argument has the type
+   char *const *, but this is inaccurate; if argument permutation is
+   enabled, the argv array (not the strings it points to) must be
+   writable.  */
+
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+
+__END_DECLS
+
+#endif /* _GETOPT_CORE_H */
diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h
new file mode 100644
index 0000000..e4da22f
--- /dev/null
+++ b/lib/getopt-ext.h
@@ -0,0 +1,77 @@
+/* Declarations for getopt (GNU extensions).
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
+
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
+
+   The GNU C Library 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 the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_EXT_H
+#define _GETOPT_EXT_H 1
+
+/* This header should not be used directly; include getopt.h instead.
+   Unlike most bits headers, it does not have a protective #error,
+   because the guard macro for getopt.h in gnulib is not fixed.  */
+
+__BEGIN_DECLS
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of 'struct option' terminated by an element containing a name which is
+   zero.
+
+   The field 'has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field 'flag' is not NULL, it points to a variable that is set
+   to the value given in the field 'val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an 'int' to
+   a compiled-in constant, such as set a value from 'optarg', set the
+   option's 'flag' field to zero and its 'val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero 'flag' field, 'getopt'
+   returns the contents of the 'val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the 'has_arg' field of 'struct option'.  */
+
+#define no_argument		0
+#define required_argument	1
+#define optional_argument	2
+
+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW _GL_ARG_NONNULL ((2, 3));
+
+__END_DECLS
+
+#endif /* _GETOPT_EXT_H */
diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h
new file mode 100644
index 0000000..4dc427d
--- /dev/null
+++ b/lib/getopt-pfx-core.h
@@ -0,0 +1,54 @@
+/* getopt (basic, portable features) gnulib wrapper header.
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of gnulib.
+   Unlike most of the getopt implementation, it is NOT shared
+   with the GNU C Library.
+
+   gnulib 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 3 of
+   the License, or (at your option) any later version.
+
+   gnulib 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 gnulib; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_PFX_CORE_H
+#define _GETOPT_PFX_CORE_H 1
+
+/* This header should not be used directly; include getopt.h or
+   unistd.h instead.  It does not have a protective #error, because
+   the guard macro for getopt.h in gnulib is not fixed.  */
+
+/* Standalone applications should #define __GETOPT_PREFIX to an
+   identifier that prefixes the external functions and variables
+   defined in getopt-core.h and getopt-ext.h.  Systematically
+   rename identifiers so that they do not collide with the system
+   functions and variables.  Renaming avoids problems with some
+   compilers and linkers.  */
+#ifdef __GETOPT_PREFIX
+# ifndef __GETOPT_ID
+#  define __GETOPT_CONCAT(x, y) x ## y
+#  define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
+#  define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
+# endif
+# undef getopt
+# undef optarg
+# undef opterr
+# undef optind
+# undef optopt
+# define getopt __GETOPT_ID (getopt)
+# define optarg __GETOPT_ID (optarg)
+# define opterr __GETOPT_ID (opterr)
+# define optind __GETOPT_ID (optind)
+# define optopt __GETOPT_ID (optopt)
+#endif
+
+#include <getopt-core.h>
+
+#endif /* _GETOPT_PFX_CORE_H */
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
new file mode 100644
index 0000000..0839759
--- /dev/null
+++ b/lib/getopt-pfx-ext.h
@@ -0,0 +1,66 @@
+/* getopt (GNU extensions) gnulib wrapper header.
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of gnulib.
+   Unlike most of the getopt implementation, it is NOT shared
+   with the GNU C Library.
+
+   gnulib 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 3 of
+   the License, or (at your option) any later version.
+
+   gnulib 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 gnulib; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GETOPT_PFX_EXT_H
+#define _GETOPT_PFX_EXT_H 1
+
+/* This header should not be used directly; include getopt.h instead.
+   It does not have a protective #error, because the guard macro for
+   getopt.h in gnulib is not fixed.  */
+
+/* Standalone applications should #define __GETOPT_PREFIX to an
+   identifier that prefixes the external functions and variables
+   defined in getopt-core.h and getopt-ext.h.  Systematically
+   rename identifiers so that they do not collide with the system
+   functions and variables.  Renaming avoids problems with some
+   compilers and linkers.  */
+#ifdef __GETOPT_PREFIX
+# ifndef __GETOPT_ID
+#  define __GETOPT_CONCAT(x, y) x ## y
+#  define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
+#  define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
+# endif
+# undef getopt_long
+# undef getopt_long_only
+# undef option
+# undef _getopt_internal
+# define getopt_long __GETOPT_ID (getopt_long)
+# define getopt_long_only __GETOPT_ID (getopt_long_only)
+# define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
+#endif
+
+/* Standalone applications get correct prototypes for getopt_long and
+   getopt_long_only; they declare "char **argv".  For backward
+   compatibility with old applications, if __GETOPT_PREFIX is not
+   defined, we supply GNU-libc-compatible, but incorrect, prototypes
+   using "char *const *argv".  (GNU libc is stuck with the incorrect
+   prototypes, as they are baked into older versions of LSB.)  */
+#ifndef __getopt_argv_const
+# if defined __GETOPT_PREFIX
+#  define __getopt_argv_const /* empty */
+# else
+#  define __getopt_argv_const const
+# endif
+#endif
+
+#include <getopt-ext.h>
+
+#endif /* _GETOPT_PFX_EXT_H */
diff --git a/lib/getopt.c b/lib/getopt.c
index 8ccb901..9a2867d 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -1,23 +1,21 @@
 /* Getopt for GNU.
-   NOTE: getopt is part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to drepper@gnu.org
-   before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1987-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
 
-   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 3 of the License, or
-   (at your option) any later version.
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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.
+   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, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
@@ -31,30 +29,54 @@
 #include <unistd.h>
 
 #ifdef _LIBC
+/* When used as part of glibc, error printing must be done differently
+   for standards compliance.  getopt is not a cancellation point, so
+   it must not call functions that are, and it is specified by an
+   older standard than stdio locking, so it must not refer to
+   functions in the "user namespace" related to stdio locking.
+   Finally, it must use glibc's internal message translation so that
+   the messages are looked up in the proper text domain.  */
 # include <libintl.h>
+# define fprintf __fxprintf_nocancel
+# define flockfile(fp) _IO_flockfile (fp)
+# define funlockfile(fp) _IO_funlockfile (fp)
 #else
 # include "gettext.h"
 # define _(msgid) gettext (msgid)
+/* When used standalone, flockfile and funlockfile might not be
+   available.  */
+# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
+      || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+#  define flockfile(fp) /* nop */
+#  define funlockfile(fp) /* nop */
+# endif
+/* When used standalone, do not attempt to use alloca.  */
+# define __libc_use_alloca(size) 0
+# undef alloca
+# define alloca(size) (abort (), (void *)0)
 #endif
 
-#if defined _LIBC && defined USE_IN_LIBIO
-# include <wchar.h>
-#endif
+/* This implementation of 'getopt' has three modes for handling
+   options interspersed with non-option arguments.  It can stop
+   scanning for options at the first non-option argument encountered,
+   as POSIX specifies.  It can continue scanning for options after the
+   first non-option argument, but permute 'argv' as it goes so that,
+   after 'getopt' is done, all the options precede all the non-option
+   arguments and 'optind' points to the first non-option argument.
+   Or, it can report non-option arguments as if they were arguments to
+   the option character '\x01'.
 
-/* This version of 'getopt' appears to the caller like standard Unix 'getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As 'getopt_long' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Using 'getopt' or setting the environment variable POSIXLY_CORRECT
+   The default behavior of 'getopt_long' is to permute the argument list.
+   When this implementation is used standalone, the default behavior of
+   'getopt' is to stop at the first non-option argument, but when it is
+   used as part of GNU libc it also permutes the argument list.  In both
+   cases, setting the environment variable POSIXLY_CORRECT to any value
    disables permutation.
-   Then the behavior is completely standard.
 
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
+   If the first character of the OPTSTRING argument to 'getopt' or
+   'getopt_long' is '+', both functions will stop at the first
+   non-option argument.  If it is '-', both functions will report
+   non-option arguments as arguments to the option character '\x01'.  */
 
 #include "getopt_int.h"
 
@@ -95,42 +117,7 @@ int optopt = '?';
 /* Keep a global copy of all internal members of getopt_data.  */
 
 static struct _getopt_data getopt_data;
-
 
-#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV
-extern char *getenv ();
-#endif
-
-#ifdef _LIBC
-/* Stored original parameters.
-   XXX This is no good solution.  We should rather copy the args so
-   that we can compare them later.  But we must not use malloc(3).  */
-extern int __libc_argc;
-extern char **__libc_argv;
-
-/* Bash 2.0 gives us an environment variable containing flags
-   indicating ARGV elements that should not be considered arguments.  */
-
-# ifdef USE_NONOPTION_FLAGS
-/* Defined in getopt_init.c  */
-extern char *__getopt_nonoption_flags;
-# endif
-
-# ifdef USE_NONOPTION_FLAGS
-#  define SWAP_FLAGS(ch1, ch2) \
-  if (d->__nonoption_flags_len > 0)                                           \
-    {                                                                         \
-      char __tmp = __getopt_nonoption_flags[ch1];                             \
-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];          \
-      __getopt_nonoption_flags[ch2] = __tmp;                                  \
-    }
-# else
-#  define SWAP_FLAGS(ch1, ch2)
-# endif
-#else   /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif  /* _LIBC */
-
 /* Exchange two adjacent subsequences of ARGV.
    One subsequence is elements [first_nonopt,last_nonopt)
    which contains all the non-options that have been skipped so far.
@@ -153,64 +140,40 @@ exchange (char **argv, struct _getopt_data *d)
      It leaves the longer segment in the right place overall,
      but it consists of two parts that need to be swapped next.  */
 
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-  /* First make sure the handling of the '__getopt_nonoption_flags'
-     string can work normally.  Our top argument must be in the range
-     of the string.  */
-  if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
-    {
-      /* We must extend the array.  The user plays games with us and
-         presents new arguments.  */
-      char *new_str = malloc (top + 1);
-      if (new_str == NULL)
-        d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
-      else
-        {
-          memset (__mempcpy (new_str, __getopt_nonoption_flags,
-                             d->__nonoption_flags_max_len),
-                  '\0', top + 1 - d->__nonoption_flags_max_len);
-          d->__nonoption_flags_max_len = top + 1;
-          __getopt_nonoption_flags = new_str;
-        }
-    }
-#endif
-
   while (top > middle && middle > bottom)
     {
       if (top - middle > middle - bottom)
-        {
-          /* Bottom segment is the short one.  */
-          int len = middle - bottom;
-          register int i;
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  int i;
 
-          /* Swap it with the top part of the top segment.  */
-          for (i = 0; i < len; i++)
-            {
-              tem = argv[bottom + i];
-              argv[bottom + i] = argv[top - (middle - bottom) + i];
-              argv[top - (middle - bottom) + i] = tem;
-              SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
-            }
-          /* Exclude the moved bottom segment from further swapping.  */
-          top -= len;
-        }
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
       else
-        {
-          /* Top segment is the short one.  */
-          int len = top - middle;
-          register int i;
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  int i;
 
-          /* Swap it with the bottom part of the bottom segment.  */
-          for (i = 0; i < len; i++)
-            {
-              tem = argv[bottom + i];
-              argv[bottom + i] = argv[middle + i];
-              argv[middle + i] = tem;
-              SWAP_FLAGS (bottom + i, middle + i);
-            }
-          /* Exclude the moved top segment from further swapping.  */
-          bottom += len;
-        }
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
     }
 
   /* Update records for the slots the non-options now occupy.  */
@@ -219,25 +182,216 @@ exchange (char **argv, struct _getopt_data *d)
   d->__last_nonopt = d->optind;
 }
 
-/* Initialize the internal data when the first call is made.  */
+/* Process the argument starting with d->__nextchar as a long option.
+   d->optind should *not* have been advanced over this argument.
+
+   If the value returned is -1, it was not actually a long option, the
+   state is unchanged, and the argument should be processed as a set
+   of short options (this can only happen when long_only is true).
+   Otherwise, the option (and its argument, if any) have been consumed
+   and the return value is the value to return from _getopt_internal_r.  */
+static int
+process_long_option (int argc, char **argv, const char *optstring,
+		     const struct option *longopts, int *longind,
+		     int long_only, struct _getopt_data *d,
+		     int print_errors, const char *prefix)
+{
+  char *nameend;
+  size_t namelen;
+  const struct option *p;
+  const struct option *pfound = NULL;
+  int n_options;
+  int option_index;
+
+  for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+    /* Do nothing.  */ ;
+  namelen = nameend - d->__nextchar;
+
+  /* First look for an exact match, counting the options as a side
+     effect.  */
+  for (p = longopts, n_options = 0; p->name; p++, n_options++)
+    if (!strncmp (p->name, d->__nextchar, namelen)
+	&& namelen == strlen (p->name))
+      {
+	/* Exact match found.  */
+	pfound = p;
+	option_index = n_options;
+	break;
+      }
+
+  if (pfound == NULL)
+    {
+      /* Didn't find an exact match, so look for abbreviations.  */
+      unsigned char *ambig_set = NULL;
+      int ambig_malloced = 0;
+      int ambig_fallback = 0;
+      int indfound = -1;
+
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, d->__nextchar, namelen))
+	  {
+	    if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
+	      {
+		/* Second or later nonexact match found.  */
+		if (!ambig_fallback)
+		  {
+		    if (!print_errors)
+		      /* Don't waste effort tracking the ambig set if
+			 we're not going to print it anyway.  */
+		      ambig_fallback = 1;
+		    else if (!ambig_set)
+		      {
+			if (__libc_use_alloca (n_options))
+			  ambig_set = alloca (n_options);
+			else if ((ambig_set = malloc (n_options)) == NULL)
+			  /* Fall back to simpler error message.  */
+			  ambig_fallback = 1;
+			else
+			  ambig_malloced = 1;
+
+			if (ambig_set)
+			  {
+			    memset (ambig_set, 0, n_options);
+			    ambig_set[indfound] = 1;
+			  }
+		      }
+		    if (ambig_set)
+		      ambig_set[option_index] = 1;
+		  }
+	      }
+	  }
+
+      if (ambig_set || ambig_fallback)
+	{
+	  if (print_errors)
+	    {
+	      if (ambig_fallback)
+		fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"),
+			 argv[0], prefix, d->__nextchar);
+	      else
+		{
+		  flockfile (stderr);
+		  fprintf (stderr,
+			   _("%s: option '%s%s' is ambiguous; possibilities:"),
+			   argv[0], prefix, d->__nextchar);
+
+		  for (option_index = 0; option_index < n_options; option_index++)
+		    if (ambig_set[option_index])
+		      fprintf (stderr, " '%s%s'",
+			       prefix, longopts[option_index].name);
+
+		  /* This must use 'fprintf' even though it's only
+		     printing a single character, so that it goes through
+		     __fxprintf_nocancel when compiled as part of glibc.  */
+		  fprintf (stderr, "\n");
+		  funlockfile (stderr);
+		}
+	    }
+	  if (ambig_malloced)
+	    free (ambig_set);
+	  d->__nextchar += strlen (d->__nextchar);
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+
+      option_index = indfound;
+    }
+
+  if (pfound == NULL)
+    {
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short option,
+	 then it's an error.  */
+      if (!long_only || argv[d->optind][1] == '-'
+	  || strchr (optstring, *d->__nextchar) == NULL)
+	{
+	  if (print_errors)
+	    fprintf (stderr, _("%s: unrecognized option '%s%s'\n"),
+		     argv[0], prefix, d->__nextchar);
+
+	  d->__nextchar = NULL;
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+
+      /* Otherwise interpret it as a short option.  */
+      return -1;
+    }
+
+  /* We have found a matching long option.  Consume it.  */
+  d->optind++;
+  d->__nextchar = NULL;
+  if (*nameend)
+    {
+      /* Don't test has_arg with >, because some C compilers don't
+	 allow it to be used on enums.  */
+      if (pfound->has_arg)
+	d->optarg = nameend + 1;
+      else
+	{
+	  if (print_errors)
+	    fprintf (stderr,
+		     _("%s: option '%s%s' doesn't allow an argument\n"),
+		     argv[0], prefix, pfound->name);
+
+	  d->optopt = pfound->val;
+	  return '?';
+	}
+    }
+  else if (pfound->has_arg == 1)
+    {
+      if (d->optind < argc)
+	d->optarg = argv[d->optind++];
+      else
+	{
+	  if (print_errors)
+	    fprintf (stderr,
+		     _("%s: option '%s%s' requires an argument\n"),
+		     argv[0], prefix, pfound->name);
+
+	  d->optopt = pfound->val;
+	  return optstring[0] == ':' ? ':' : '?';
+	}
+    }
+
+  if (longind != NULL)
+    *longind = option_index;
+  if (pfound->flag)
+    {
+      *(pfound->flag) = pfound->val;
+      return 0;
+    }
+  return pfound->val;
+}
+
+/* Initialize internal data upon the first call to getopt.  */
 
 static const char *
 _getopt_initialize (int argc _GL_UNUSED,
-                    char **argv _GL_UNUSED, const char *optstring,
-                    struct _getopt_data *d, int posixly_correct)
+		    char **argv _GL_UNUSED, const char *optstring,
+		    struct _getopt_data *d, int posixly_correct)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
      is the program name); the sequence of previously skipped
      non-option ARGV-elements is empty.  */
+  if (d->optind == 0)
+    d->optind = 1;
 
   d->__first_nonopt = d->__last_nonopt = d->optind;
-
   d->__nextchar = NULL;
 
-  d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT");
-
   /* Determine how to handle the ordering of options and nonoptions.  */
-
   if (optstring[0] == '-')
     {
       d->__ordering = RETURN_IN_ORDER;
@@ -248,41 +402,12 @@ _getopt_initialize (int argc _GL_UNUSED,
       d->__ordering = REQUIRE_ORDER;
       ++optstring;
     }
-  else if (d->__posixly_correct)
+  else if (posixly_correct || !!getenv ("POSIXLY_CORRECT"))
     d->__ordering = REQUIRE_ORDER;
   else
     d->__ordering = PERMUTE;
 
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-  if (!d->__posixly_correct
-      && argc == __libc_argc && argv == __libc_argv)
-    {
-      if (d->__nonoption_flags_max_len == 0)
-        {
-          if (__getopt_nonoption_flags == NULL
-              || __getopt_nonoption_flags[0] == '\0')
-            d->__nonoption_flags_max_len = -1;
-          else
-            {
-              const char *orig_str = __getopt_nonoption_flags;
-              int len = d->__nonoption_flags_max_len = strlen (orig_str);
-              if (d->__nonoption_flags_max_len < argc)
-                d->__nonoption_flags_max_len = argc;
-              __getopt_nonoption_flags =
-                (char *) malloc (d->__nonoption_flags_max_len);
-              if (__getopt_nonoption_flags == NULL)
-                d->__nonoption_flags_max_len = -1;
-              else
-                memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-                        '\0', d->__nonoption_flags_max_len - len);
-            }
-        }
-      d->__nonoption_flags_len = d->__nonoption_flags_max_len;
-    }
-  else
-    d->__nonoption_flags_len = 0;
-#endif
-
+  d->__initialized = 1;
   return optstring;
 }
 
@@ -344,8 +469,8 @@ _getopt_initialize (int argc _GL_UNUSED,
 
 int
 _getopt_internal_r (int argc, char **argv, const char *optstring,
-                    const struct option *longopts, int *longind,
-                    int long_only, struct _getopt_data *d, int posixly_correct)
+		    const struct option *longopts, int *longind,
+		    int long_only, struct _getopt_data *d, int posixly_correct)
 {
   int print_errors = d->opterr;
 
@@ -355,461 +480,129 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
   d->optarg = NULL;
 
   if (d->optind == 0 || !d->__initialized)
-    {
-      if (d->optind == 0)
-        d->optind = 1;  /* Don't scan ARGV[0], the program name.  */
-      optstring = _getopt_initialize (argc, argv, optstring, d,
-                                      posixly_correct);
-      d->__initialized = 1;
-    }
+    optstring = _getopt_initialize (argc, argv, optstring, d, posixly_correct);
   else if (optstring[0] == '-' || optstring[0] == '+')
     optstring++;
+
   if (optstring[0] == ':')
     print_errors = 0;
 
-  /* Test whether ARGV[optind] points to a non-option argument.
-     Either it does not have option syntax, or there is an environment flag
-     from the shell indicating it is not an option.  The later information
-     is only used when the used in the GNU libc.  */
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
-                      || (d->optind < d->__nonoption_flags_len                \
-                          && __getopt_nonoption_flags[d->optind] == '1'))
-#else
-# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
-#endif
+  /* Test whether ARGV[optind] points to a non-option argument.  */
+#define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
 
   if (d->__nextchar == NULL || *d->__nextchar == '\0')
     {
       /* Advance to the next ARGV-element.  */
 
       /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
-         moved back by the user (who may also have changed the arguments).  */
+	 moved back by the user (who may also have changed the arguments).  */
       if (d->__last_nonopt > d->optind)
-        d->__last_nonopt = d->optind;
+	d->__last_nonopt = d->optind;
       if (d->__first_nonopt > d->optind)
-        d->__first_nonopt = d->optind;
+	d->__first_nonopt = d->optind;
 
       if (d->__ordering == PERMUTE)
-        {
-          /* If we have just processed some options following some non-options,
-             exchange them so that the options come first.  */
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
 
-          if (d->__first_nonopt != d->__last_nonopt
-              && d->__last_nonopt != d->optind)
-            exchange ((char **) argv, d);
-          else if (d->__last_nonopt != d->optind)
-            d->__first_nonopt = d->optind;
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange (argv, d);
+	  else if (d->__last_nonopt != d->optind)
+	    d->__first_nonopt = d->optind;
 
-          /* Skip any additional non-options
-             and extend the range of non-options previously skipped.  */
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
 
-          while (d->optind < argc && NONOPTION_P)
-            d->optind++;
-          d->__last_nonopt = d->optind;
-        }
+	  while (d->optind < argc && NONOPTION_P)
+	    d->optind++;
+	  d->__last_nonopt = d->optind;
+	}
 
       /* The special ARGV-element '--' means premature end of options.
-         Skip it like a null option,
-         then exchange with previous non-options as if it were an option,
-         then skip everything else like a non-option.  */
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
 
       if (d->optind != argc && !strcmp (argv[d->optind], "--"))
-        {
-          d->optind++;
+	{
+	  d->optind++;
 
-          if (d->__first_nonopt != d->__last_nonopt
-              && d->__last_nonopt != d->optind)
-            exchange ((char **) argv, d);
-          else if (d->__first_nonopt == d->__last_nonopt)
-            d->__first_nonopt = d->optind;
-          d->__last_nonopt = argc;
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange (argv, d);
+	  else if (d->__first_nonopt == d->__last_nonopt)
+	    d->__first_nonopt = d->optind;
+	  d->__last_nonopt = argc;
 
-          d->optind = argc;
-        }
+	  d->optind = argc;
+	}
 
       /* If we have done all the ARGV-elements, stop the scan
-         and back over any non-options that we skipped and permuted.  */
+	 and back over any non-options that we skipped and permuted.  */
 
       if (d->optind == argc)
-        {
-          /* Set the next-arg-index to point at the non-options
-             that we previously skipped, so the caller will digest them.  */
-          if (d->__first_nonopt != d->__last_nonopt)
-            d->optind = d->__first_nonopt;
-          return -1;
-        }
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (d->__first_nonopt != d->__last_nonopt)
+	    d->optind = d->__first_nonopt;
+	  return -1;
+	}
 
       /* If we have come to a non-option and did not permute it,
-         either stop the scan or describe it to the caller and pass it by.  */
+	 either stop the scan or describe it to the caller and pass it by.  */
 
       if (NONOPTION_P)
-        {
-          if (d->__ordering == REQUIRE_ORDER)
-            return -1;
-          d->optarg = argv[d->optind++];
-          return 1;
-        }
+	{
+	  if (d->__ordering == REQUIRE_ORDER)
+	    return -1;
+	  d->optarg = argv[d->optind++];
+	  return 1;
+	}
 
       /* We have found another option-ARGV-element.
-         Skip the initial punctuation.  */
+	 Check whether it might be a long option.  */
+      if (longopts)
+	{
+	  if (argv[d->optind][1] == '-')
+	    {
+	      /* "--foo" is always a long option.  The special option
+		 "--" was handled above.  */
+	      d->__nextchar = argv[d->optind] + 2;
+	      return process_long_option (argc, argv, optstring, longopts,
+					  longind, long_only, d,
+					  print_errors, "--");
+	    }
 
-      d->__nextchar = (argv[d->optind] + 1
-                  + (longopts != NULL && argv[d->optind][1] == '-'));
-    }
+	  /* If long_only and the ARGV-element has the form "-f",
+	     where f is a valid short option, don't consider it an
+	     abbreviated form of a long option that starts with f.
+	     Otherwise there would be no way to give the -f short
+	     option.
 
-  /* Decode the current option-ARGV-element.  */
+	     On the other hand, if there's a long option "fubar" and
+	     the ARGV-element is "-fu", do consider that an
+	     abbreviation of the long option, just like "--fu", and
+	     not "-f" with arg "u".
 
-  /* Check whether the ARGV-element is a long option.
+	     This distinction seems to be the most useful approach.  */
+	  if (long_only && (argv[d->optind][2]
+			    || !strchr (optstring, argv[d->optind][1])))
+	    {
+	      int code;
+	      d->__nextchar = argv[d->optind] + 1;
+	      code = process_long_option (argc, argv, optstring, longopts,
+					  longind, long_only, d,
+					  print_errors, "-");
+	      if (code != -1)
+		return code;
+	    }
+	}
 
-     If long_only and the ARGV-element has the form "-f", where f is
-     a valid short option, don't consider it an abbreviated form of
-     a long option that starts with f.  Otherwise there would be no
-     way to give the -f short option.
-
-     On the other hand, if there's a long option "fubar" and
-     the ARGV-element is "-fu", do consider that an abbreviation of
-     the long option, just like "--fu", and not "-f" with arg "u".
-
-     This distinction seems to be the most useful approach.  */
-
-  if (longopts != NULL
-      && (argv[d->optind][1] == '-'
-          || (long_only && (argv[d->optind][2]
-                            || !strchr (optstring, argv[d->optind][1])))))
-    {
-      char *nameend;
-      unsigned int namelen;
-      const struct option *p;
-      const struct option *pfound = NULL;
-      struct option_list
-      {
-        const struct option *p;
-        struct option_list *next;
-      } *ambig_list = NULL;
-#ifdef _LIBC
-/* malloc() not used for _LIBC to simplify failure messages.  */
-# define free_option_list(l)
-#else
-# define free_option_list(l)			\
-      while (l != NULL)				\
-        {					\
-          struct option_list *pn = l->next;	\
-          free (l);				\
-          l = pn;				\
-        }
-#endif
-      int exact = 0;
-      int ambig = 0;
-      int indfound = -1;
-      int option_index;
-
-      for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
-        /* Do nothing.  */ ;
-      namelen = nameend - d->__nextchar;
-
-      /* Test all long options for either exact match
-         or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
-        if (!strncmp (p->name, d->__nextchar, namelen))
-          {
-            if (namelen == (unsigned int) strlen (p->name))
-              {
-                /* Exact match found.  */
-                pfound = p;
-                indfound = option_index;
-                exact = 1;
-                break;
-              }
-            else if (pfound == NULL)
-              {
-                /* First nonexact match found.  */
-                pfound = p;
-                indfound = option_index;
-              }
-            else if (ambig)
-              ; /* Taking simpler path to handling ambiguities.  */
-            else if (long_only
-                     || pfound->has_arg != p->has_arg
-                     || pfound->flag != p->flag
-                     || pfound->val != p->val)
-              {
-                /* Second or later nonexact match found.  */
-#ifdef _LIBC
-                struct option_list *newp = alloca (sizeof (*newp));
-#else
-                struct option_list *newp = malloc (sizeof (*newp));
-                if (newp == NULL)
-                  {
-                    free_option_list (ambig_list);
-                    ambig_list = NULL;
-                    ambig = 1; /* Use simpler fallback message.  */
-                  }
-                else
-#endif
-                  {
-                    newp->p = p;
-                    newp->next = ambig_list;
-                    ambig_list = newp;
-                  }
-              }
-          }
-
-      if ((ambig || ambig_list) && !exact)
-        {
-          if (print_errors && ambig_list)
-            {
-              struct option_list first;
-              first.p = pfound;
-              first.next = ambig_list;
-              ambig_list = &first;
-
-#if defined _LIBC && defined USE_IN_LIBIO
-              char *buf = NULL;
-              size_t buflen = 0;
-
-              FILE *fp = open_memstream (&buf, &buflen);
-              if (fp != NULL)
-                {
-                  fprintf (fp,
-                           _("%s: option '%s' is ambiguous; possibilities:"),
-                           argv[0], argv[d->optind]);
-
-                  do
-                    {
-                      fprintf (fp, " '--%s'", ambig_list->p->name);
-                      ambig_list = ambig_list->next;
-                    }
-                  while (ambig_list != NULL);
-
-                  fputc_unlocked ('\n', fp);
-
-                  if (__builtin_expect (fclose (fp) != EOF, 1))
-                    {
-                      _IO_flockfile (stderr);
-
-                      int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                      ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                      __fxprintf (NULL, "%s", buf);
-
-                      ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                      _IO_funlockfile (stderr);
-
-                      free (buf);
-                    }
-                }
-#else
-              fprintf (stderr,
-                       _("%s: option '%s' is ambiguous; possibilities:"),
-                       argv[0], argv[d->optind]);
-              do
-                {
-                  fprintf (stderr, " '--%s'", ambig_list->p->name);
-                  ambig_list = ambig_list->next;
-                }
-              while (ambig_list != NULL);
-
-              fputc ('\n', stderr);
-#endif
-            }
-          else if (print_errors && ambig)
-            {
-              fprintf (stderr,
-                       _("%s: option '%s' is ambiguous\n"),
-                       argv[0], argv[d->optind]);
-            }
-          d->__nextchar += strlen (d->__nextchar);
-          d->optind++;
-          d->optopt = 0;
-          free_option_list (ambig_list);
-          return '?';
-        }
-
-      free_option_list (ambig_list);
-
-      if (pfound != NULL)
-        {
-          option_index = indfound;
-          d->optind++;
-          if (*nameend)
-            {
-              /* Don't test has_arg with >, because some C compilers don't
-                 allow it to be used on enums.  */
-              if (pfound->has_arg)
-                d->optarg = nameend + 1;
-              else
-                {
-                  if (print_errors)
-                    {
-#if defined _LIBC && defined USE_IN_LIBIO
-                      char *buf;
-                      int n;
-#endif
-
-                      if (argv[d->optind - 1][1] == '-')
-                        {
-                          /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
-                          n = __asprintf (&buf, _("\
-%s: option '--%s' doesn't allow an argument\n"),
-                                          argv[0], pfound->name);
-#else
-                          fprintf (stderr, _("\
-%s: option '--%s' doesn't allow an argument\n"),
-                                   argv[0], pfound->name);
-#endif
-                        }
-                      else
-                        {
-                          /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
-                          n = __asprintf (&buf, _("\
-%s: option '%c%s' doesn't allow an argument\n"),
-                                          argv[0], argv[d->optind - 1][0],
-                                          pfound->name);
-#else
-                          fprintf (stderr, _("\
-%s: option '%c%s' doesn't allow an argument\n"),
-                                   argv[0], argv[d->optind - 1][0],
-                                   pfound->name);
-#endif
-                        }
-
-#if defined _LIBC && defined USE_IN_LIBIO
-                      if (n >= 0)
-                        {
-                          _IO_flockfile (stderr);
-
-                          int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                          ((_IO_FILE *) stderr)->_flags2
-                            |= _IO_FLAGS2_NOTCANCEL;
-
-                          __fxprintf (NULL, "%s", buf);
-
-                          ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                          _IO_funlockfile (stderr);
-
-                          free (buf);
-                        }
-#endif
-                    }
-
-                  d->__nextchar += strlen (d->__nextchar);
-
-                  d->optopt = pfound->val;
-                  return '?';
-                }
-            }
-          else if (pfound->has_arg == 1)
-            {
-              if (d->optind < argc)
-                d->optarg = argv[d->optind++];
-              else
-                {
-                  if (print_errors)
-                    {
-#if defined _LIBC && defined USE_IN_LIBIO
-                      char *buf;
-
-                      if (__asprintf (&buf, _("\
-%s: option '--%s' requires an argument\n"),
-                                      argv[0], pfound->name) >= 0)
-                        {
-                          _IO_flockfile (stderr);
-
-                          int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                          ((_IO_FILE *) stderr)->_flags2
-                            |= _IO_FLAGS2_NOTCANCEL;
-
-                          __fxprintf (NULL, "%s", buf);
-
-                          ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                          _IO_funlockfile (stderr);
-
-                          free (buf);
-                        }
-#else
-                      fprintf (stderr,
-                               _("%s: option '--%s' requires an argument\n"),
-                               argv[0], pfound->name);
-#endif
-                    }
-                  d->__nextchar += strlen (d->__nextchar);
-                  d->optopt = pfound->val;
-                  return optstring[0] == ':' ? ':' : '?';
-                }
-            }
-          d->__nextchar += strlen (d->__nextchar);
-          if (longind != NULL)
-            *longind = option_index;
-          if (pfound->flag)
-            {
-              *(pfound->flag) = pfound->val;
-              return 0;
-            }
-          return pfound->val;
-        }
-
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-         or the option starts with '--' or is not a valid short
-         option, then it's an error.
-         Otherwise interpret it as a short option.  */
-      if (!long_only || argv[d->optind][1] == '-'
-          || strchr (optstring, *d->__nextchar) == NULL)
-        {
-          if (print_errors)
-            {
-#if defined _LIBC && defined USE_IN_LIBIO
-              char *buf;
-              int n;
-#endif
-
-              if (argv[d->optind][1] == '-')
-                {
-                  /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
-                  n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"),
-                                  argv[0], d->__nextchar);
-#else
-                  fprintf (stderr, _("%s: unrecognized option '--%s'\n"),
-                           argv[0], d->__nextchar);
-#endif
-                }
-              else
-                {
-                  /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
-                  n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"),
-                                  argv[0], argv[d->optind][0], d->__nextchar);
-#else
-                  fprintf (stderr, _("%s: unrecognized option '%c%s'\n"),
-                           argv[0], argv[d->optind][0], d->__nextchar);
-#endif
-                }
-
-#if defined _LIBC && defined USE_IN_LIBIO
-              if (n >= 0)
-                {
-                  _IO_flockfile (stderr);
-
-                  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                  __fxprintf (NULL, "%s", buf);
-
-                  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                  _IO_funlockfile (stderr);
-
-                  free (buf);
-                }
-#endif
-            }
-          d->__nextchar = (char *) "";
-          d->optind++;
-          d->optopt = 0;
-          return '?';
-        }
+      /* It is not a long option.  Skip the initial punctuation.  */
+      d->__nextchar = argv[d->optind] + 1;
     }
 
   /* Look at and handle the next short option-character.  */
@@ -824,331 +617,83 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
     if (temp == NULL || c == ':' || c == ';')
       {
-        if (print_errors)
-          {
-#if defined _LIBC && defined USE_IN_LIBIO
-              char *buf;
-              int n;
-#endif
-
-#if defined _LIBC && defined USE_IN_LIBIO
-              n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
-                              argv[0], c);
-#else
-              fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c);
-#endif
-
-#if defined _LIBC && defined USE_IN_LIBIO
-            if (n >= 0)
-              {
-                _IO_flockfile (stderr);
-
-                int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                __fxprintf (NULL, "%s", buf);
-
-                ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                _IO_funlockfile (stderr);
-
-                free (buf);
-              }
-#endif
-          }
-        d->optopt = c;
-        return '?';
+	if (print_errors)
+	  fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c);
+	d->optopt = c;
+	return '?';
       }
+
     /* Convenience. Treat POSIX -W foo same as long option --foo */
-    if (temp[0] == 'W' && temp[1] == ';')
+    if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL)
       {
-        char *nameend;
-        const struct option *p;
-        const struct option *pfound = NULL;
-        int exact = 0;
-        int ambig = 0;
-        int indfound = 0;
-        int option_index;
+	/* This is an option that requires an argument.  */
+	if (*d->__nextchar != '\0')
+	  d->optarg = d->__nextchar;
+	else if (d->optind == argc)
+	  {
+	    if (print_errors)
+	      fprintf (stderr,
+		       _("%s: option requires an argument -- '%c'\n"),
+		       argv[0], c);
 
-        if (longopts == NULL)
-          goto no_longs;
+	    d->optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  d->optarg = argv[d->optind];
 
-        /* This is an option that requires an argument.  */
-        if (*d->__nextchar != '\0')
-          {
-            d->optarg = d->__nextchar;
-            /* If we end this ARGV-element by taking the rest as an arg,
-               we must advance to the next element now.  */
-            d->optind++;
-          }
-        else if (d->optind == argc)
-          {
-            if (print_errors)
-              {
-#if defined _LIBC && defined USE_IN_LIBIO
-                char *buf;
-
-                if (__asprintf (&buf,
-                                _("%s: option requires an argument -- '%c'\n"),
-                                argv[0], c) >= 0)
-                  {
-                    _IO_flockfile (stderr);
-
-                    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                    __fxprintf (NULL, "%s", buf);
-
-                    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                    _IO_funlockfile (stderr);
-
-                    free (buf);
-                  }
-#else
-                fprintf (stderr,
-                         _("%s: option requires an argument -- '%c'\n"),
-                         argv[0], c);
-#endif
-              }
-            d->optopt = c;
-            if (optstring[0] == ':')
-              c = ':';
-            else
-              c = '?';
-            return c;
-          }
-        else
-          /* We already incremented 'd->optind' once;
-             increment it again when taking next ARGV-elt as argument.  */
-          d->optarg = argv[d->optind++];
-
-        /* optarg is now the argument, see if it's in the
-           table of longopts.  */
-
-        for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
-             nameend++)
-          /* Do nothing.  */ ;
-
-        /* Test all long options for either exact match
-           or abbreviated matches.  */
-        for (p = longopts, option_index = 0; p->name; p++, option_index++)
-          if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
-            {
-              if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
-                {
-                  /* Exact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-                  exact = 1;
-                  break;
-                }
-              else if (pfound == NULL)
-                {
-                  /* First nonexact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-                }
-              else if (long_only
-                       || pfound->has_arg != p->has_arg
-                       || pfound->flag != p->flag
-                       || pfound->val != p->val)
-                /* Second or later nonexact match found.  */
-                ambig = 1;
-            }
-        if (ambig && !exact)
-          {
-            if (print_errors)
-              {
-#if defined _LIBC && defined USE_IN_LIBIO
-                char *buf;
-
-                if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"),
-                                argv[0], d->optarg) >= 0)
-                  {
-                    _IO_flockfile (stderr);
-
-                    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                    __fxprintf (NULL, "%s", buf);
-
-                    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                    _IO_funlockfile (stderr);
-
-                    free (buf);
-                  }
-#else
-                fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
-                         argv[0], d->optarg);
-#endif
-              }
-            d->__nextchar += strlen (d->__nextchar);
-            d->optind++;
-            return '?';
-          }
-        if (pfound != NULL)
-          {
-            option_index = indfound;
-            if (*nameend)
-              {
-                /* Don't test has_arg with >, because some C compilers don't
-                   allow it to be used on enums.  */
-                if (pfound->has_arg)
-                  d->optarg = nameend + 1;
-                else
-                  {
-                    if (print_errors)
-                      {
-#if defined _LIBC && defined USE_IN_LIBIO
-                        char *buf;
-
-                        if (__asprintf (&buf, _("\
-%s: option '-W %s' doesn't allow an argument\n"),
-                                        argv[0], pfound->name) >= 0)
-                          {
-                            _IO_flockfile (stderr);
-
-                            int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                            ((_IO_FILE *) stderr)->_flags2
-                              |= _IO_FLAGS2_NOTCANCEL;
-
-                            __fxprintf (NULL, "%s", buf);
-
-                            ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                            _IO_funlockfile (stderr);
-
-                            free (buf);
-                          }
-#else
-                        fprintf (stderr, _("\
-%s: option '-W %s' doesn't allow an argument\n"),
-                                 argv[0], pfound->name);
-#endif
-                      }
-
-                    d->__nextchar += strlen (d->__nextchar);
-                    return '?';
-                  }
-              }
-            else if (pfound->has_arg == 1)
-              {
-                if (d->optind < argc)
-                  d->optarg = argv[d->optind++];
-                else
-                  {
-                    if (print_errors)
-                      {
-#if defined _LIBC && defined USE_IN_LIBIO
-                        char *buf;
-
-                        if (__asprintf (&buf, _("\
-%s: option '-W %s' requires an argument\n"),
-                                        argv[0], pfound->name) >= 0)
-                          {
-                            _IO_flockfile (stderr);
-
-                            int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                            ((_IO_FILE *) stderr)->_flags2
-                              |= _IO_FLAGS2_NOTCANCEL;
-
-                            __fxprintf (NULL, "%s", buf);
-
-                            ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                            _IO_funlockfile (stderr);
-
-                            free (buf);
-                          }
-#else
-                        fprintf (stderr, _("\
-%s: option '-W %s' requires an argument\n"),
-                                 argv[0], pfound->name);
-#endif
-                      }
-                    d->__nextchar += strlen (d->__nextchar);
-                    return optstring[0] == ':' ? ':' : '?';
-                  }
-              }
-            else
-              d->optarg = NULL;
-            d->__nextchar += strlen (d->__nextchar);
-            if (longind != NULL)
-              *longind = option_index;
-            if (pfound->flag)
-              {
-                *(pfound->flag) = pfound->val;
-                return 0;
-              }
-            return pfound->val;
-          }
-
-      no_longs:
-        d->__nextchar = NULL;
-        return 'W';   /* Let the application handle it.   */
+	d->__nextchar = d->optarg;
+	d->optarg = NULL;
+	return process_long_option (argc, argv, optstring, longopts, longind,
+				    0 /* long_only */, d, print_errors, "-W ");
       }
     if (temp[1] == ':')
       {
-        if (temp[2] == ':')
-          {
-            /* This is an option that accepts an argument optionally.  */
-            if (*d->__nextchar != '\0')
-              {
-                d->optarg = d->__nextchar;
-                d->optind++;
-              }
-            else
-              d->optarg = NULL;
-            d->__nextchar = NULL;
-          }
-        else
-          {
-            /* This is an option that requires an argument.  */
-            if (*d->__nextchar != '\0')
-              {
-                d->optarg = d->__nextchar;
-                /* If we end this ARGV-element by taking the rest as an arg,
-                   we must advance to the next element now.  */
-                d->optind++;
-              }
-            else if (d->optind == argc)
-              {
-                if (print_errors)
-                  {
-#if defined _LIBC && defined USE_IN_LIBIO
-                    char *buf;
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		d->optind++;
+	      }
+	    else
+	      d->optarg = NULL;
+	    d->__nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		d->optind++;
+	      }
+	    else if (d->optind == argc)
+	      {
+		if (print_errors)
+		  fprintf (stderr,
+			   _("%s: option requires an argument -- '%c'\n"),
+			   argv[0], c);
 
-                    if (__asprintf (&buf, _("\
-%s: option requires an argument -- '%c'\n"),
-                                    argv[0], c) >= 0)
-                      {
-                        _IO_flockfile (stderr);
-
-                        int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                        ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
-                        __fxprintf (NULL, "%s", buf);
-
-                        ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                        _IO_funlockfile (stderr);
-
-                        free (buf);
-                      }
-#else
-                    fprintf (stderr,
-                             _("%s: option requires an argument -- '%c'\n"),
-                             argv[0], c);
-#endif
-                  }
-                d->optopt = c;
-                if (optstring[0] == ':')
-                  c = ':';
-                else
-                  c = '?';
-              }
-            else
-              /* We already incremented 'optind' once;
-                 increment it again when taking next ARGV-elt as argument.  */
-              d->optarg = argv[d->optind++];
-            d->__nextchar = NULL;
-          }
+		d->optopt = c;
+		if (optstring[0] == ':')
+		  c = ':';
+		else
+		  c = '?';
+	      }
+	    else
+	      /* We already incremented 'optind' once;
+		 increment it again when taking next ARGV-elt as argument.  */
+	      d->optarg = argv[d->optind++];
+	    d->__nextchar = NULL;
+	  }
       }
     return c;
   }
@@ -1156,8 +701,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
 int
 _getopt_internal (int argc, char **argv, const char *optstring,
-                  const struct option *longopts, int *longind, int long_only,
-                  int posixly_correct)
+		  const struct option *longopts, int *longind, int long_only,
+		  int posixly_correct)
 {
   int result;
 
@@ -1165,8 +710,8 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   getopt_data.opterr = opterr;
 
   result = _getopt_internal_r (argc, argv, optstring, longopts,
-                               longind, long_only, &getopt_data,
-                               posixly_correct);
+			       longind, long_only, &getopt_data,
+			       posixly_correct);
 
   optind = getopt_data.optind;
   optarg = getopt_data.optarg;
@@ -1175,32 +720,23 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   return result;
 }
 
-/* glibc gets a LSB-compliant getopt.
-   Standalone applications get a POSIX-compliant getopt.  */
-#if _LIBC
-enum { POSIXLY_CORRECT = 0 };
-#else
-enum { POSIXLY_CORRECT = 1 };
-#endif
-
-int
-getopt (int argc, char *const *argv, const char *optstring)
-{
-  return _getopt_internal (argc, (char **) argv, optstring,
-                           (const struct option *) 0,
-                           (int *) 0,
-                           0, POSIXLY_CORRECT);
-}
+/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt.
+   Standalone applications just get a POSIX-compliant getopt.
+   POSIX and LSB both require these functions to take 'char *const *argv'
+   even though this is incorrect (because of the permutation).  */
+#define GETOPT_ENTRY(NAME, POSIXLY_CORRECT)			\
+  int								\
+  NAME (int argc, char *const *argv, const char *optstring)	\
+  {								\
+    return _getopt_internal (argc, (char **)argv, optstring,	\
+			     0, 0, 0, POSIXLY_CORRECT);		\
+  }
 
 #ifdef _LIBC
-int
-__posix_getopt (int argc, char *const *argv, const char *optstring)
-{
-  return _getopt_internal (argc, argv, optstring,
-                           (const struct option *) 0,
-                           (int *) 0,
-                           0, 1);
-}
+GETOPT_ENTRY(getopt, 0)
+GETOPT_ENTRY(__posix_getopt, 1)
+#else
+GETOPT_ENTRY(getopt, 1)
 #endif
 
 
@@ -1221,51 +757,51 @@ main (int argc, char **argv)
 
       c = getopt (argc, argv, "abc:d:0123456789");
       if (c == -1)
-        break;
+	break;
 
       switch (c)
-        {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (digit_optind != 0 && digit_optind != this_option_optind)
-            printf ("digits occur in two different argv-elements.\n");
-          digit_optind = this_option_optind;
-          printf ("option %c\n", c);
-          break;
+	{
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
 
-        case 'a':
-          printf ("option a\n");
-          break;
+	case 'a':
+	  printf ("option a\n");
+	  break;
 
-        case 'b':
-          printf ("option b\n");
-          break;
+	case 'b':
+	  printf ("option b\n");
+	  break;
 
-        case 'c':
-          printf ("option c with value '%s'\n", optarg);
-          break;
+	case 'c':
+	  printf ("option c with value '%s'\n", optarg);
+	  break;
 
-        case '?':
-          break;
+	case '?':
+	  break;
 
-        default:
-          printf ("?? getopt returned character code 0%o ??\n", c);
-        }
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
     }
 
   if (optind < argc)
     {
       printf ("non-option ARGV-elements: ");
       while (optind < argc)
-        printf ("%s ", argv[optind++]);
+	printf ("%s ", argv[optind++]);
       printf ("\n");
     }
 
diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 0f72182..4ce1eb4 100644
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -1,20 +1,22 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of gnulib.
+   Unlike most of the getopt implementation, it is NOT shared
+   with the GNU C Library, which supplies a different version of
+   this file.
 
-   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 3 of the License, or
-   (at your option) any later version.
+   gnulib 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 3 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.
+   gnulib 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, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public
+   License along with gnulib; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _@GUARD_PREFIX@_GETOPT_H
 
@@ -32,22 +34,15 @@
 # undef _GL_SYSTEM_GETOPT
 #endif
 
-#ifndef _@GUARD_PREFIX@_GETOPT_H
-
-#ifndef __need_getopt
-# define _@GUARD_PREFIX@_GETOPT_H 1
-#endif
+#define _@GUARD_PREFIX@_GETOPT_H 1
 
 /* Standalone applications should #define __GETOPT_PREFIX to an
    identifier that prefixes the external functions and variables
-   defined in this header.  When this happens, include the
-   headers that might declare getopt so that they will not cause
-   confusion if included after this file (if the system had <getopt.h>,
-   we have already included it).  Then systematically rename
-   identifiers so that they do not collide with the system functions
-   and variables.  Renaming avoids problems with some compilers and
-   linkers.  */
-#if defined __GETOPT_PREFIX && !defined __need_getopt
+   defined in getopt-core.h and getopt-ext.h.  When this happens,
+   include the headers that might declare getopt so that they will not
+   cause confusion if included after this file (if the system had
+   <getopt.h>, we have already included it).  */
+#if defined __GETOPT_PREFIX
 # if !@HAVE_GETOPT_H@
 #  define __need_system_stdlib_h
 #  include <stdlib.h>
@@ -55,201 +50,12 @@
 #  include <stdio.h>
 #  include <unistd.h>
 # endif
-# undef __need_getopt
-# undef getopt
-# undef getopt_long
-# undef getopt_long_only
-# undef optarg
-# undef opterr
-# undef optind
-# undef optopt
-# undef option
-# define __GETOPT_CONCAT(x, y) x ## y
-# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
-# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
-# define getopt __GETOPT_ID (getopt)
-# define getopt_long __GETOPT_ID (getopt_long)
-# define getopt_long_only __GETOPT_ID (getopt_long_only)
-# define optarg __GETOPT_ID (optarg)
-# define opterr __GETOPT_ID (opterr)
-# define optind __GETOPT_ID (optind)
-# define optopt __GETOPT_ID (optopt)
-# define option __GETOPT_ID (option)
-# define _getopt_internal __GETOPT_ID (getopt_internal)
-#endif
-
-/* Standalone applications get correct prototypes for getopt_long and
-   getopt_long_only; they declare "char **argv".  libc uses prototypes
-   with "char *const *argv" that are incorrect because getopt_long and
-   getopt_long_only can permute argv; this is required for backward
-   compatibility (e.g., for LSB 2.0.1).
-
-   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
-   but it caused redefinition warnings if both unistd.h and getopt.h were
-   included, since unistd.h includes getopt.h having previously defined
-   __need_getopt.
-
-   The only place where __getopt_argv_const is used is in definitions
-   of getopt_long and getopt_long_only below, but these are visible
-   only if __need_getopt is not defined, so it is quite safe to rewrite
-   the conditional as follows:
-*/
-#if !defined __need_getopt
-# if defined __GETOPT_PREFIX
-#  define __getopt_argv_const /* empty */
-# else
-#  define __getopt_argv_const const
-# endif
-#endif
-
-/* If __GNU_LIBRARY__ is not already defined, either we are being used
-   standalone, or this is the first header included in the source file.
-   If we are being used with glibc, we need to include <features.h>, but
-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
-   not defined, include <ctype.h>, which will pull in <features.h> for us
-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
-   doesn't flood the namespace with stuff the way some other headers do.)  */
-#if !defined __GNU_LIBRARY__
-# include <ctype.h>
-#endif
-
-#ifndef __THROW
-# ifndef __GNUC_PREREQ
-#  define __GNUC_PREREQ(maj, min) (0)
-# endif
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-#  define __THROW       throw ()
-# else
-#  define __THROW
-# endif
 #endif
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
-
-   On entry to 'getopt', zero means this is the first call; initialize.
-
-   When 'getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, 'optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message 'getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of 'struct option' terminated by an element containing a name which is
-   zero.
-
-   The field 'has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
-
-   If the field 'flag' is not NULL, it points to a variable that is set
-   to the value given in the field 'val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an 'int' to
-   a compiled-in constant, such as set a value from 'optarg', set the
-   option's 'flag' field to zero and its 'val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero 'flag' field, 'getopt'
-   returns the contents of the 'val' field.  */
-
-# if !GNULIB_defined_struct_option
-struct option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-#  define GNULIB_defined_struct_option 1
-# endif
-
-/* Names for the values of the 'has_arg' field of 'struct option'.  */
-
-# define no_argument            0
-# define required_argument      1
-# define optional_argument      2
-#endif  /* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, 'optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in 'optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU 'getopt'.
-
-   The argument '--' causes premature termination of argument
-   scanning, explicitly telling 'getopt' that there are no more
-   options.
-
-   If OPTS begins with '-', then non-option arguments are treated as
-   arguments to the option '\1'.  This behavior is specific to the GNU
-   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
-   the environment, then do not permute arguments.  */
-
-extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-
-#ifndef __need_getopt
-extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
-                        const char *__shortopts,
-                        const struct option *__longopts, int *__longind)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
-                             const char *__shortopts,
-                             const struct option *__longopts, int *__longind)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
+#include <getopt-cdefs.h>
+#include <getopt-pfx-core.h>
+#include <getopt-pfx-ext.h>
 
 #endif /* _@GUARD_PREFIX@_GETOPT_H */
-#endif /* _@GUARD_PREFIX@_GETOPT_H */
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 63db74f..2bc5926 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,56 +1,44 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1987-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
 
-   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 3 of the License, or
-   (at your option) any later version.
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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.
+   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, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-#ifdef _LIBC
-# include <getopt.h>
-#else
+#ifndef _LIBC
 # include <config.h>
-# include "getopt.h"
 #endif
+
+#include "getopt.h"
 #include "getopt_int.h"
 
-#include <stdio.h>
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
 int
 getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
-             const struct option *long_options, int *opt_index)
+	     const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, (char **) argv, options, long_options,
-                           opt_index, 0, 0);
+			   opt_index, 0, 0);
 }
 
 int
 _getopt_long_r (int argc, char **argv, const char *options,
-                const struct option *long_options, int *opt_index,
-                struct _getopt_data *d)
+		const struct option *long_options, int *opt_index,
+		struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-                             0, d, 0);
+			     0, d, 0);
 }
 
 /* Like getopt_long, but '-' as well as '--' can indicate a long option.
@@ -60,26 +48,27 @@ _getopt_long_r (int argc, char **argv, const char *options,
 
 int
 getopt_long_only (int argc, char *__getopt_argv_const *argv,
-                  const char *options,
-                  const struct option *long_options, int *opt_index)
+		  const char *options,
+		  const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, (char **) argv, options, long_options,
-                           opt_index, 1, 0);
+			   opt_index, 1, 0);
 }
 
 int
 _getopt_long_only_r (int argc, char **argv, const char *options,
-                     const struct option *long_options, int *opt_index,
-                     struct _getopt_data *d)
+		     const struct option *long_options, int *opt_index,
+		     struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-                             1, d, 0);
+			     1, d, 0);
 }
 
 
 #ifdef TEST
 
 #include <stdio.h>
+#include <stdlib.h>
 
 int
 main (int argc, char **argv)
@@ -93,74 +82,74 @@ main (int argc, char **argv)
       int option_index = 0;
       static const struct option long_options[] =
       {
-        {"add", 1, 0, 0},
-        {"append", 0, 0, 0},
-        {"delete", 1, 0, 0},
-        {"verbose", 0, 0, 0},
-        {"create", 0, 0, 0},
-        {"file", 1, 0, 0},
-        {0, 0, 0, 0}
+	{"add", 1, 0, 0},
+	{"append", 0, 0, 0},
+	{"delete", 1, 0, 0},
+	{"verbose", 0, 0, 0},
+	{"create", 0, 0, 0},
+	{"file", 1, 0, 0},
+	{0, 0, 0, 0}
       };
 
       c = getopt_long (argc, argv, "abc:d:0123456789",
-                       long_options, &option_index);
+		       long_options, &option_index);
       if (c == -1)
-        break;
+	break;
 
       switch (c)
-        {
-        case 0:
-          printf ("option %s", long_options[option_index].name);
-          if (optarg)
-            printf (" with arg %s", optarg);
-          printf ("\n");
-          break;
+	{
+	case 0:
+	  printf ("option %s", long_options[option_index].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
 
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (digit_optind != 0 && digit_optind != this_option_optind)
-            printf ("digits occur in two different argv-elements.\n");
-          digit_optind = this_option_optind;
-          printf ("option %c\n", c);
-          break;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
 
-        case 'a':
-          printf ("option a\n");
-          break;
+	case 'a':
+	  printf ("option a\n");
+	  break;
 
-        case 'b':
-          printf ("option b\n");
-          break;
+	case 'b':
+	  printf ("option b\n");
+	  break;
 
-        case 'c':
-          printf ("option c with value '%s'\n", optarg);
-          break;
+	case 'c':
+	  printf ("option c with value '%s'\n", optarg);
+	  break;
 
-        case 'd':
-          printf ("option d with value '%s'\n", optarg);
-          break;
+	case 'd':
+	  printf ("option d with value '%s'\n", optarg);
+	  break;
 
-        case '?':
-          break;
+	case '?':
+	  break;
 
-        default:
-          printf ("?? getopt returned character code 0%o ??\n", c);
-        }
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
     }
 
   if (optind < argc)
     {
       printf ("non-option ARGV-elements: ");
       while (optind < argc)
-        printf ("%s ", argv[optind++]);
+	printf ("%s ", argv[optind++]);
       printf ("\n");
     }
 
diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index be4c22e..a556219 100644
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -1,30 +1,31 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1989-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library and is also part of gnulib.
+   Patches to this file should be submitted to both projects.
 
-   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 3 of the License, or
-   (at your option) any later version.
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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.
+   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, see <http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_INT_H
-#define _GETOPT_INT_H   1
+#define _GETOPT_INT_H	1
 
 #include <getopt.h>
 
 extern int _getopt_internal (int ___argc, char **___argv,
-                             const char *__shortopts,
-                             const struct option *__longopts, int *__longind,
-                             int __long_only, int __posixly_correct);
+			     const char *__shortopts,
+			     const struct option *__longopts, int *__longind,
+			     int __long_only, int __posixly_correct);
 
 
 /* Reentrant versions which can handle parsing multiple argument
@@ -32,28 +33,20 @@ extern int _getopt_internal (int ___argc, char **___argv,
 
 /* Describe how to deal with options that follow non-option ARGV-elements.
 
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+   REQUIRE_ORDER means don't recognize them as options; stop option
+   processing when the first non-option is seen.  This is what POSIX
+   specifies should happen.
 
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using '+' as the first character
-   of the list of option characters, or by calling getopt.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we
-   scan, so that eventually all the non-options are at the end.
-   This allows options to be given in any order, even with programs
-   that were not written to expect this.
+   PERMUTE means permute the contents of ARGV as we scan, so that
+   eventually all the non-options are at the end.  This allows options
+   to be given in any order, even with programs that were not written
+   to expect this.
 
    RETURN_IN_ORDER is an option available to programs that were
    written to expect options and other ARGV-elements in any order
    and that care about the ordering of the two.  We describe each
    non-option ARGV-element as if it were the argument of an option
-   with character code 1.  Using '-' as the first character of the
-   list of option characters selects this mode of operation.
+   with character code 1.
 
    The special argument '--' forces an end of option-scanning regardless
    of the value of 'ordering'.  In the case of RETURN_IN_ORDER, only
@@ -91,11 +84,6 @@ struct _getopt_data
   /* See __ord above.  */
   enum __ord __ordering;
 
-  /* If the POSIXLY_CORRECT environment variable is set
-     or getopt was called.  */
-  int __posixly_correct;
-
-
   /* Handle permutation of arguments.  */
 
   /* Describe the part of ARGV that contains non-options that have
@@ -104,32 +92,27 @@ struct _getopt_data
 
   int __first_nonopt;
   int __last_nonopt;
-
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-  int __nonoption_flags_max_len;
-  int __nonoption_flags_len;
-#endif
 };
 
 /* The initializer is necessary to set OPTIND and OPTERR to their
    default values and to clear the initialization flag.  */
-#define _GETOPT_DATA_INITIALIZER        { 1, 1 }
+#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
 
 extern int _getopt_internal_r (int ___argc, char **___argv,
-                               const char *__shortopts,
-                               const struct option *__longopts, int *__longind,
-                               int __long_only, struct _getopt_data *__data,
-                               int __posixly_correct);
+			       const char *__shortopts,
+			       const struct option *__longopts, int *__longind,
+			       int __long_only, struct _getopt_data *__data,
+			       int __posixly_correct);
 
 extern int _getopt_long_r (int ___argc, char **___argv,
-                           const char *__shortopts,
-                           const struct option *__longopts, int *__longind,
-                           struct _getopt_data *__data);
+			   const char *__shortopts,
+			   const struct option *__longopts, int *__longind,
+			   struct _getopt_data *__data);
 
 extern int _getopt_long_only_r (int ___argc, char **___argv,
-                                const char *__shortopts,
-                                const struct option *__longopts,
-                                int *__longind,
-                                struct _getopt_data *__data);
+				const char *__shortopts,
+				const struct option *__longopts,
+				int *__longind,
+				struct _getopt_data *__data);
 
 #endif /* getopt_int.h */
diff --git a/lib/gettext.h b/lib/gettext.h
index 00af872..e7520af 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,9 @@
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
 
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+/* NLS can be disabled through the configure --disable-nls option
+   or through "#define ENABLE NLS 0" before including this file.  */
+#if defined ENABLE_NLS && ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
@@ -225,15 +226,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +274,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 224ca6a..8ae7622 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,93 +24,95 @@
 
 #include <time.h>
 
-#if HAVE_SYS_TIMEB_H
-# include <sys/timeb.h>
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WINDOWS_NATIVE
+# include <windows.h>
 #endif
 
-#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+#include "localtime-buffer.h"
 
-/* Work around the bug in some systems whereby gettimeofday clobbers
-   the static buffer that localtime uses for its return value.  The
-   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
-   this problem.  The tzset replacement is necessary for at least
-   Solaris 2.5, 2.5.1, and 2.6.  */
+#ifdef WINDOWS_NATIVE
 
-static struct tm tm_zero_buffer;
-static struct tm *localtime_buffer_addr = &tm_zero_buffer;
+/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8.  */
+typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime);
+static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL;
+static BOOL initialized = FALSE;
 
-# undef localtime
-extern struct tm *localtime (time_t const *);
-
-# undef gmtime
-extern struct tm *gmtime (time_t const *);
-
-/* This is a wrapper for localtime.  It is used only on systems for which
-   gettimeofday clobbers the static buffer used for localtime's result.
-
-   On the first call, record the address of the static buffer that
-   localtime uses for its result.  */
-
-struct tm *
-rpl_localtime (time_t const *timep)
+static void
+initialize (void)
 {
-  struct tm *tm = localtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
+  HMODULE kernel32 = LoadLibrary ("kernel32.dll");
+  if (kernel32 != NULL)
+    {
+      GetSystemTimePreciseAsFileTimeFunc =
+	(GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime");
+    }
+  initialized = TRUE;
 }
 
-/* Same as above, since gmtime and localtime use the same buffer.  */
-struct tm *
-rpl_gmtime (time_t const *timep)
-{
-  struct tm *tm = gmtime (timep);
-
-  if (localtime_buffer_addr == &tm_zero_buffer)
-    localtime_buffer_addr = tm;
-
-  return tm;
-}
-
-#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
-
-#if TZSET_CLOBBERS_LOCALTIME
-
-# undef tzset
-extern void tzset (void);
-
-/* This is a wrapper for tzset, for systems on which tzset may clobber
-   the static buffer used for localtime's result.  */
-void
-rpl_tzset (void)
-{
-  /* Save and restore the contents of the buffer used for localtime's
-     result around the call to tzset.  */
-  struct tm save = *localtime_buffer_addr;
-  tzset ();
-  *localtime_buffer_addr = save;
-}
 #endif
 
 /* This is a wrapper for gettimeofday.  It is used only on systems
    that lack this function, or whose implementation of this function
-   causes problems.  */
+   causes problems.
+   Work around the bug in some systems whereby gettimeofday clobbers
+   the static buffer that localtime uses for its return value.  The
+   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
+   this problem.  */
 
 int
 gettimeofday (struct timeval *restrict tv, void *restrict tz)
 {
 #undef gettimeofday
-#if HAVE_GETTIMEOFDAY
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+#ifdef WINDOWS_NATIVE
+
+  /* On native Windows, there are two ways to get the current time:
+     GetSystemTimeAsFileTime
+     <https://msdn.microsoft.com/en-us/library/ms724397.aspx>
+     or
+     GetSystemTimePreciseAsFileTime
+     <https://msdn.microsoft.com/en-us/library/hh706895.aspx>.
+     GetSystemTimeAsFileTime produces values that jump by increments of
+     15.627 milliseconds (!) on average.
+     Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2
+     microseconds.
+     More discussion on this topic:
+     <http://www.windowstimestamp.com/description>.  */
+  FILETIME current_time;
+
+  if (!initialized)
+    initialize ();
+  if (GetSystemTimePreciseAsFileTimeFunc != NULL)
+    GetSystemTimePreciseAsFileTimeFunc (&current_time);
+  else
+    GetSystemTimeAsFileTime (&current_time);
+
+  /* Convert from FILETIME to 'struct timeval'.  */
+  /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */
+  ULONGLONG since_1601 =
+    ((ULONGLONG) current_time.dwHighDateTime << 32)
+    | (ULONGLONG) current_time.dwLowDateTime;
+  /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap
+     years, in total 134774 days.  */
+  ULONGLONG since_1970 =
+    since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000;
+  ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10;
+  tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000;
+  tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000;
+
+  return 0;
+
+#else
+
+# if HAVE_GETTIMEOFDAY
+#  if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   /* Save and restore the contents of the buffer used for localtime's
      result around the call to gettimeofday.  */
   struct tm save = *localtime_buffer_addr;
-# endif
+#  endif
 
-# if defined timeval /* 'struct timeval' overridden by gnulib?  */
-#  undef timeval
+#  if defined timeval /* 'struct timeval' overridden by gnulib?  */
+#   undef timeval
   struct timeval otv;
   int result = gettimeofday (&otv, (struct timezone *) tz);
   if (result == 0)
@@ -118,25 +120,16 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz)
       tv->tv_sec = otv.tv_sec;
       tv->tv_usec = otv.tv_usec;
     }
-# else
+#  else
   int result = gettimeofday (tv, (struct timezone *) tz);
-# endif
+#  endif
 
-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
+#  if GETTIMEOFDAY_CLOBBERS_LOCALTIME
   *localtime_buffer_addr = save;
-# endif
+#  endif
 
   return result;
 
-#else
-
-# if HAVE__FTIME
-
-  struct _timeb timebuf;
-  _ftime (&timebuf);
-  tv->tv_sec = timebuf.time;
-  tv->tv_usec = timebuf.millitm * 1000;
-
 # else
 
 #  if !defined OK_TO_USE_1S_CLOCK
@@ -146,9 +139,8 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz)
   tv->tv_sec = time (NULL);
   tv->tv_usec = 0;
 
-# endif
-
   return 0;
 
+# endif
 #endif
 }
diff --git a/lib/hard-locale.c b/lib/hard-locale.c
new file mode 100644
index 0000000..57ed42b
--- /dev/null
+++ b/lib/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2017 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+bool
+hard_locale (int category)
+{
+  bool hard = true;
+  char const *p = setlocale (category, NULL);
+
+  if (p)
+    {
+      if (2 <= GLIBC_VERSION)
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
+      else
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
+
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
+    }
+
+  return hard;
+}
diff --git a/lib/hard-locale.h b/lib/hard-locale.h
new file mode 100644
index 0000000..ba424af
--- /dev/null
+++ b/lib/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003-2004, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/lib/iconv.c b/lib/iconv.c
index 9ce9c01..89951cb 100644
--- a/lib/iconv.c
+++ b/lib/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/iconv.in.h b/lib/iconv.in.h
index cb1da14..ddaae67 100644
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/iconv_close.c b/lib/iconv_close.c
index d1cd793..ddadf6a 100644
--- a/lib/iconv_close.c
+++ b/lib/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index d5c5a52..376dc41 100644
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/limits.in.h b/lib/limits.in.h
new file mode 100644
index 0000000..08d3c32
--- /dev/null
+++ b/lib/limits.in.h
@@ -0,0 +1,74 @@
+/* A GNU-like <limits.h>.
+
+   Copyright 2016-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 3, 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, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_LIMITS_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_LIMITS_H@
+
+#ifndef _@GUARD_PREFIX@_LIMITS_H
+#define _@GUARD_PREFIX@_LIMITS_H
+
+/* For HP-UX 11.31.  */
+#if defined LONG_LONG_MIN && !defined LLONG_MIN
+# define LLONG_MIN LONG_LONG_MIN
+#endif
+#if defined LONG_LONG_MAX && !defined LLONG_MAX
+# define LLONG_MAX LONG_LONG_MAX
+#endif
+#if defined ULONG_LONG_MAX && !defined ULLONG_MAX
+# define ULLONG_MAX ULONG_LONG_MAX
+#endif
+
+/* The number of usable bits in an unsigned or signed integer type
+   with minimum value MIN and maximum value MAX, as an int expression
+   suitable in #if.  Cover all known practical hosts.  This
+   implementation exploits the fact that MAX is 1 less than a power of
+   2, and merely counts the number of 1 bits in MAX; "COBn" means
+   "count the number of 1 bits in the low-order n bits").  */
+#define _GL_INTEGER_WIDTH(min, max) (((min) < 0) + _GL_COB128 (max))
+#define _GL_COB128(n) (_GL_COB64 ((n) >> 31 >> 31 >> 2) + _GL_COB64 (n))
+#define _GL_COB64(n) (_GL_COB32 ((n) >> 31 >> 1) + _GL_COB32 (n))
+#define _GL_COB32(n) (_GL_COB16 ((n) >> 16) + _GL_COB16 (n))
+#define _GL_COB16(n) (_GL_COB8 ((n) >> 8) + _GL_COB8 (n))
+#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n))
+#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1))
+
+/* Macros specified by ISO/IEC TS 18661-1:2014.  */
+
+#if (! defined ULLONG_WIDTH                                             \
+     && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__))
+# define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX)
+# define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX)
+# define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX)
+# define SHRT_WIDTH _GL_INTEGER_WIDTH (SHRT_MIN, SHRT_MAX)
+# define USHRT_WIDTH _GL_INTEGER_WIDTH (0, USHRT_MAX)
+# define INT_WIDTH _GL_INTEGER_WIDTH (INT_MIN, INT_MAX)
+# define UINT_WIDTH _GL_INTEGER_WIDTH (0, UINT_MAX)
+# define LONG_WIDTH _GL_INTEGER_WIDTH (LONG_MIN, LONG_MAX)
+# define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX)
+# define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX)
+# define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX)
+#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */
+
+#endif /* _@GUARD_PREFIX@_LIMITS_H */
+#endif /* _@GUARD_PREFIX@_LIMITS_H */
diff --git a/lib/localcharset.c b/lib/localcharset.c
index b2a0369..9b7e6cb 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
 #endif
 
-#if defined _WIN32 || defined __WIN32__
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
 # define WINDOWS_NATIVE
 # include <locale.h>
 #endif
@@ -75,6 +75,7 @@
 # include "relocatable.h"
 #else
 # define relocate(pathname) (pathname)
+# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname))
 #endif
 
 /* Get LIBDIR.  */
@@ -129,6 +130,7 @@ get_charset_aliases (void)
   if (cp == NULL)
     {
 #if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
+      char *malloc_dir = NULL;
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -137,7 +139,7 @@ get_charset_aliases (void)
          necessary for running the testsuite before "make install".  */
       dir = getenv ("CHARSETALIASDIR");
       if (dir == NULL || dir[0] == '\0')
-        dir = relocate (LIBDIR);
+        dir = relocate2 (LIBDIR, &malloc_dir);
 
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
@@ -154,6 +156,8 @@ get_charset_aliases (void)
           }
       }
 
+      free (malloc_dir);
+
       if (file_name == NULL)
         /* Out of memory.  Treat the file as empty.  */
         cp = "";
@@ -507,7 +511,7 @@ locale_charset (void)
     current_locale = setlocale (LC_CTYPE, NULL);
 
   pdot = strrchr (current_locale, '.');
-  if (pdot)
+  if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf))
     sprintf (buf, "CP%s", pdot + 1);
   else
     {
diff --git a/lib/localcharset.h b/lib/localcharset.h
index 915182e..a2e2a7b 100644
--- a/lib/localcharset.h
+++ b/lib/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2017 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/locale.in.h b/lib/locale.in.h
index 4083507..9eb43f9 100644
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/localtime-buffer.c b/lib/localtime-buffer.c
new file mode 100644
index 0000000..f84ad3e
--- /dev/null
+++ b/lib/localtime-buffer.c
@@ -0,0 +1,58 @@
+/* Provide access to the last buffer returned by localtime() or gmtime().
+
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, 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, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localtime-buffer.h"
+
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+
+static struct tm tm_zero_buffer;
+struct tm *localtime_buffer_addr = &tm_zero_buffer;
+
+/* This is a wrapper for localtime.
+
+   On the first call, record the address of the static buffer that
+   localtime uses for its result.  */
+
+struct tm *
+rpl_localtime (time_t const *timep)
+{
+  struct tm *tm = localtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+/* Same as above, since gmtime and localtime use the same buffer.  */
+struct tm *
+rpl_gmtime (time_t const *timep)
+{
+  struct tm *tm = gmtime (timep);
+
+  if (localtime_buffer_addr == &tm_zero_buffer)
+    localtime_buffer_addr = tm;
+
+  return tm;
+}
+
+#endif
diff --git a/lib/localtime-buffer.h b/lib/localtime-buffer.h
new file mode 100644
index 0000000..483a579
--- /dev/null
+++ b/lib/localtime-buffer.h
@@ -0,0 +1,27 @@
+/* Provide access to the last buffer returned by localtime() or gmtime().
+
+   Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, 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, see <http://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+#include <time.h>
+
+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
+
+/* The address of the last buffer returned by localtime() or gmtime().  */
+extern struct tm *localtime_buffer_addr;
+
+#endif
diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c
index 864e006..7415fff 100644
--- a/lib/mbrtowc.c
+++ b/lib/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,11 @@
 /* Specification.  */
 #include <wchar.h>
 
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
 #if GNULIB_defined_mbstate_t
 /* Implement mbrtowc() on top of mbtowc().  */
 
@@ -30,6 +35,13 @@
 # include "streq.h"
 # include "verify.h"
 
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
 
 verify (sizeof (mbstate_t) >= 4);
 
@@ -69,10 +81,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
         break;
       case 3:
         buf[2] = pstate[3];
-        /*FALLTHROUGH*/
+        FALLTHROUGH;
       case 2:
         buf[1] = pstate[2];
-        /*FALLTHROUGH*/
+        FALLTHROUGH;
       case 1:
         buf[0] = pstate[1];
         p = buf;
@@ -328,6 +340,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
+  size_t ret;
+  wchar_t wc;
+
 # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
     {
@@ -342,6 +357,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     return (size_t) -2;
 # endif
 
+  if (! pwc)
+    pwc = &wc;
+
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
@@ -357,8 +375,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
         size_t count = 0;
         for (; n > 0; s++, n--)
           {
-            wchar_t wc;
-            size_t ret = mbrtowc (&wc, s, 1, ps);
+            ret = mbrtowc (&wc, s, 1, ps);
 
             if (ret == (size_t)(-1))
               return (size_t)(-1);
@@ -366,8 +383,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
             if (ret != (size_t)(-2))
               {
                 /* The multibyte character has been completed.  */
-                if (pwc != NULL)
-                  *pwc = wc;
+                *pwc = wc;
                 return (wc == 0 ? 0 : count);
               }
           }
@@ -376,32 +392,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   }
 # endif
 
+  ret = mbrtowc (pwc, s, n, ps);
+
 # if MBRTOWC_NUL_RETVAL_BUG
-  {
-    wchar_t wc;
-    size_t ret = mbrtowc (&wc, s, n, ps);
-
-    if (ret != (size_t)(-1) && ret != (size_t)(-2))
-      {
-        if (pwc != NULL)
-          *pwc = wc;
-        if (wc == 0)
-          ret = 0;
-      }
-    return ret;
-  }
-# else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
-
-    return mbrtowc (pwc, s, n, ps);
-  }
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
 # endif
+
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
+# endif
+
+  return ret;
 }
 
 #endif
diff --git a/lib/mbsinit.c b/lib/mbsinit.c
index 372b523..7580126 100644
--- a/lib/mbsinit.c
+++ b/lib/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,17 +22,7 @@
 
 #include "verify.h"
 
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-
-/* On native Windows, 'mbstate_t' is defined as 'int'.  */
-
-int
-mbsinit (const mbstate_t *ps)
-{
-  return ps == NULL || *ps == 0;
-}
-
-#else
+#if GNULIB_defined_mbstate_t
 
 /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
    and wcrtomb(), wcsrtombs().
@@ -45,6 +35,7 @@ mbsinit (const mbstate_t *ps)
    We define the meaning of mbstate_t as follows:
      - In mb -> wc direction, mbstate_t's first byte contains the number of
        buffered bytes (in the range 0..3), followed by up to 3 buffered bytes.
+       See mbrtowc.c.
      - In wc -> mb direction, mbstate_t contains no information. In other
        words, it is always in the initial state.  */
 
@@ -58,4 +49,25 @@ mbsinit (const mbstate_t *ps)
   return pstate == NULL || pstate[0] == 0;
 }
 
+#else
+
+int
+mbsinit (const mbstate_t *ps)
+{
+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* Native Windows.  */
+#  ifdef __MINGW32__
+  /* On mingw, 'mbstate_t' is defined as 'int'.  */
+  return ps == NULL || *ps == 0;
+#  else
+  /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4-bytes matter.  */
+  return ps == NULL || *(const unsigned int *)ps == 0;
+#  endif
+# else
+  /* Minix, HP-UX 11.00, Solaris 2.6, Interix, ...  */
+  /* Maybe this definition works, maybe not...  */
+  return ps == NULL || *(const char *)ps == 0;
+# endif
+}
+
 #endif
diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h
index f99fa34..d787c07 100644
--- a/lib/mbsrtowcs-impl.h
+++ b/lib/mbsrtowcs-impl.h
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c
index 905547a..4c213e4 100644
--- a/lib/mbsrtowcs-state.c
+++ b/lib/mbsrtowcs-state.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c
index 54bf6f7..7896e94 100644
--- a/lib/mbsrtowcs.c
+++ b/lib/mbsrtowcs.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h
index 4be2994..b53b2eb 100644
--- a/lib/mbtowc-impl.h
+++ b/lib/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbtowc.c b/lib/mbtowc.c
index fb2b651..118754f 100644
--- a/lib/mbtowc.c
+++ b/lib/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/memchr.c b/lib/memchr.c
index b565542..3481260 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/lib/ref-add.sin b/lib/ref-add.sin
index 42d3ab0..3913e99 100644
--- a/lib/ref-add.sin
+++ b/lib/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/lib/ref-del.sin b/lib/ref-del.sin
index c77b33b..eeff947 100644
--- a/lib/ref-del.sin
+++ b/lib/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h
index 7ecf203..1067ed2 100644
--- a/lib/stdbool.in.h
+++ b/lib/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/stddef.in.h b/lib/stddef.in.h
index c6d2317..5b496a6 100644
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -81,8 +81,10 @@
 # define wchar_t int
 #endif
 
-/* Some platforms lack max_align_t.  */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
 /* On the x86, the maximum storage alignment of double, long, etc. is 4,
    but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
    and the C11 standard allows this.  Work around this problem by
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index d241391..5fbec34 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -79,54 +79,65 @@
 #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
 #define _@GUARD_PREFIX@_STDINT_H
 
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+   LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH.  */
+#include <limits.h>
+
+/* Override WINT_MIN and WINT_MAX if gnulib's <wchar.h> or <wctype.h> overrides
+   wint_t.  */
+#if @GNULIB_OVERRIDES_WINT_T@
+# undef WINT_MIN
+# undef WINT_MAX
+# define WINT_MIN 0x0U
+# define WINT_MAX 0xffffffffU
+#endif
+
+#if ! @HAVE_C99_STDINT_H@
+
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
    AIX 5.2 <sys/types.h> isn't needed and causes troubles.
    Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
-#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
-# include <sys/types.h>
-#endif
+# if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+#  include <sys/types.h>
+# endif
 
-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX.  */
-#include <limits.h>
-
-#if @HAVE_INTTYPES_H@
+# if @HAVE_INTTYPES_H@
   /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> also defines intptr_t and uintptr_t.  */
-# include <inttypes.h>
-#elif @HAVE_SYS_INTTYPES_H@
+#  include <inttypes.h>
+# elif @HAVE_SYS_INTTYPES_H@
   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
      the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
-# include <sys/inttypes.h>
-#endif
+#  include <sys/inttypes.h>
+# endif
 
-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
   /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
      int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
      included by <sys/types.h>.  */
-# include <sys/bitypes.h>
-#endif
+#  include <sys/bitypes.h>
+# endif
 
-#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
 /* Minimum and maximum values for an integer type under the usual assumption.
    Return an unspecified value if BITS == 0, adding a check to pacify
    picky compilers.  */
 
-#define _STDINT_MIN(signed, bits, zero) \
-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+/* These are separate macros, because if you try to merge these macros into
+   a single one, HP-UX cc rejects the resulting expression in constant
+   expressions.  */
+# define _STDINT_UNSIGNED_MIN(bits, zero) \
+    (zero)
+# define _STDINT_SIGNED_MIN(bits, zero) \
+    (~ _STDINT_MAX (1, bits, zero))
 
-#define _STDINT_MAX(signed, bits, zero) \
-  ((signed) \
-   ? ~ _STDINT_MIN (signed, bits, zero) \
-   : /* The expression for the unsigned case.  The subtraction of (signed) \
-        is a nop in the unsigned case and avoids "signed integer overflow" \
-        warnings in the signed case.  */ \
-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+# define _STDINT_MAX(signed, bits, zero) \
+    (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
 #if !GNULIB_defined_stdint_types
 
@@ -135,26 +146,26 @@
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits.  */
 
-#undef int8_t
-#undef uint8_t
+# undef int8_t
+# undef uint8_t
 typedef signed char gl_int8_t;
 typedef unsigned char gl_uint8_t;
-#define int8_t gl_int8_t
-#define uint8_t gl_uint8_t
+# define int8_t gl_int8_t
+# define uint8_t gl_uint8_t
 
-#undef int16_t
-#undef uint16_t
+# undef int16_t
+# undef uint16_t
 typedef short int gl_int16_t;
 typedef unsigned short int gl_uint16_t;
-#define int16_t gl_int16_t
-#define uint16_t gl_uint16_t
+# define int16_t gl_int16_t
+# define uint16_t gl_uint16_t
 
-#undef int32_t
-#undef uint32_t
+# undef int32_t
+# undef uint32_t
 typedef int gl_int32_t;
 typedef unsigned int gl_uint32_t;
-#define int32_t gl_int32_t
-#define uint32_t gl_uint32_t
+# define int32_t gl_int32_t
+# define uint32_t gl_uint32_t
 
 /* If the system defines INT64_MAX, assume int64_t works.  That way,
    if the underlying platform defines int64_t to be a 64-bit long long
@@ -162,54 +173,54 @@ typedef unsigned int gl_uint32_t;
    int, which would mess up C++ name mangling.  We must use #ifdef
    rather than #if, to avoid an error with HP-UX 10.20 cc.  */
 
-#ifdef INT64_MAX
-# define GL_INT64_T
-#else
+# ifdef INT64_MAX
+#  define GL_INT64_T
+# else
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
    types, since otherwise it breaks platforms like Tandem/NSK.  */
-# if LONG_MAX >> 31 >> 31 == 1
-#  undef int64_t
+#  if LONG_MAX >> 31 >> 31 == 1
+#   undef int64_t
 typedef long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif defined _MSC_VER
-#  undef int64_t
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif defined _MSC_VER
+#   undef int64_t
 typedef __int64 gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif @HAVE_LONG_LONG_INT@
-#  undef int64_t
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif @HAVE_LONG_LONG_INT@
+#   undef int64_t
 typedef long long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  endif
 # endif
-#endif
 
-#ifdef UINT64_MAX
-# define GL_UINT64_T
-#else
-# if ULONG_MAX >> 31 >> 31 >> 1 == 1
-#  undef uint64_t
+# ifdef UINT64_MAX
+#  define GL_UINT64_T
+# else
+#  if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#   undef uint64_t
 typedef unsigned long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif defined _MSC_VER
-#  undef uint64_t
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif defined _MSC_VER
+#   undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@
-#  undef uint64_t
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#   undef uint64_t
 typedef unsigned long long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  endif
 # endif
-#endif
 
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
-#define _UINT8_T
-#define _UINT32_T
-#define _UINT64_T
+# define _UINT8_T
+# define _UINT32_T
+# define _UINT64_T
 
 
 /* 7.18.1.2. Minimum-width integer types */
@@ -218,26 +229,26 @@ typedef unsigned long long int gl_uint64_t;
    types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
    are the same as the corresponding N_t types.  */
 
-#undef int_least8_t
-#undef uint_least8_t
-#undef int_least16_t
-#undef uint_least16_t
-#undef int_least32_t
-#undef uint_least32_t
-#undef int_least64_t
-#undef uint_least64_t
-#define int_least8_t int8_t
-#define uint_least8_t uint8_t
-#define int_least16_t int16_t
-#define uint_least16_t uint16_t
-#define int_least32_t int32_t
-#define uint_least32_t uint32_t
-#ifdef GL_INT64_T
-# define int_least64_t int64_t
-#endif
-#ifdef GL_UINT64_T
-# define uint_least64_t uint64_t
-#endif
+# undef int_least8_t
+# undef uint_least8_t
+# undef int_least16_t
+# undef uint_least16_t
+# undef int_least32_t
+# undef uint_least32_t
+# undef int_least64_t
+# undef uint_least64_t
+# define int_least8_t int8_t
+# define uint_least8_t uint8_t
+# define int_least16_t int16_t
+# define uint_least16_t uint16_t
+# define int_least32_t int32_t
+# define uint_least32_t uint32_t
+# ifdef GL_INT64_T
+#  define int_least64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_least64_t uint64_t
+# endif
 
 /* 7.18.1.3. Fastest minimum-width integer types */
 
@@ -250,50 +261,55 @@ typedef unsigned long long int gl_uint64_t;
    uses types consistent with glibc, as that lessens the chance of
    incompatibility with older GNU hosts.  */
 
-#undef int_fast8_t
-#undef uint_fast8_t
-#undef int_fast16_t
-#undef uint_fast16_t
-#undef int_fast32_t
-#undef uint_fast32_t
-#undef int_fast64_t
-#undef uint_fast64_t
+# undef int_fast8_t
+# undef uint_fast8_t
+# undef int_fast16_t
+# undef uint_fast16_t
+# undef int_fast32_t
+# undef uint_fast32_t
+# undef int_fast64_t
+# undef uint_fast64_t
 typedef signed char gl_int_fast8_t;
 typedef unsigned char gl_uint_fast8_t;
 
-#ifdef __sun
+# ifdef __sun
 /* Define types compatible with SunOS 5.10, so that code compiled under
    earlier SunOS versions works with code compiled under SunOS 5.10.  */
 typedef int gl_int_fast32_t;
 typedef unsigned int gl_uint_fast32_t;
-#else
+# else
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
-#endif
+# endif
 typedef gl_int_fast32_t gl_int_fast16_t;
 typedef gl_uint_fast32_t gl_uint_fast16_t;
 
-#define int_fast8_t gl_int_fast8_t
-#define uint_fast8_t gl_uint_fast8_t
-#define int_fast16_t gl_int_fast16_t
-#define uint_fast16_t gl_uint_fast16_t
-#define int_fast32_t gl_int_fast32_t
-#define uint_fast32_t gl_uint_fast32_t
-#ifdef GL_INT64_T
-# define int_fast64_t int64_t
-#endif
-#ifdef GL_UINT64_T
-# define uint_fast64_t uint64_t
-#endif
+# define int_fast8_t gl_int_fast8_t
+# define uint_fast8_t gl_uint_fast8_t
+# define int_fast16_t gl_int_fast16_t
+# define uint_fast16_t gl_uint_fast16_t
+# define int_fast32_t gl_int_fast32_t
+# define uint_fast32_t gl_uint_fast32_t
+# ifdef GL_INT64_T
+#  define int_fast64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_fast64_t uint64_t
+# endif
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
 
-#undef intptr_t
-#undef uintptr_t
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+   definitions of intptr_t and uintptr_t (which use int and unsigned)
+   to avoid clashes with declarations of system functions like sbrk.  */
+# ifndef _INTPTR_T_DECLARED
+# undef intptr_t
+# undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
-#define intptr_t gl_intptr_t
-#define uintptr_t gl_uintptr_t
+# define intptr_t gl_intptr_t
+# define uintptr_t gl_uintptr_t
+# endif
 
 /* 7.18.1.5. Greatest-width integer types */
 
@@ -304,33 +320,33 @@ typedef unsigned long int gl_uintptr_t;
    similarly for UINTMAX_MAX and uintmax_t.  This avoids problems with
    assuming one type where another is used by the system.  */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_C
-# undef intmax_t
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# ifndef INTMAX_MAX
+#  undef INTMAX_C
+#  undef intmax_t
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# elif defined GL_INT64_T
-#  define intmax_t int64_t
-# else
+#   define intmax_t gl_intmax_t
+#  elif defined GL_INT64_T
+#   define intmax_t int64_t
+#  else
 typedef long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
+#   define intmax_t gl_intmax_t
+#  endif
 # endif
-#endif
 
-#ifndef UINTMAX_MAX
-# undef UINTMAX_C
-# undef uintmax_t
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# ifndef UINTMAX_MAX
+#  undef UINTMAX_C
+#  undef uintmax_t
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# elif defined GL_UINT64_T
-#  define uintmax_t uint64_t
-# else
+#   define uintmax_t gl_uintmax_t
+#  elif defined GL_UINT64_T
+#   define uintmax_t uint64_t
+#  else
 typedef unsigned long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
+#   define uintmax_t gl_uintmax_t
+#  endif
 # endif
-#endif
 
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
    breaks if this is not the case.  If this check fails, the reason is likely
@@ -338,8 +354,8 @@ typedef unsigned long int gl_uintmax_t;
 typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
                                 ? 1 : -1];
 
-#define GNULIB_defined_stdint_types 1
-#endif /* !GNULIB_defined_stdint_types */
+# define GNULIB_defined_stdint_types 1
+# endif /* !GNULIB_defined_stdint_types */
 
 /* 7.18.2. Limits of specified-width integer types */
 
@@ -348,37 +364,37 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits.  */
 
-#undef INT8_MIN
-#undef INT8_MAX
-#undef UINT8_MAX
-#define INT8_MIN  (~ INT8_MAX)
-#define INT8_MAX  127
-#define UINT8_MAX  255
+# undef INT8_MIN
+# undef INT8_MAX
+# undef UINT8_MAX
+# define INT8_MIN  (~ INT8_MAX)
+# define INT8_MAX  127
+# define UINT8_MAX  255
 
-#undef INT16_MIN
-#undef INT16_MAX
-#undef UINT16_MAX
-#define INT16_MIN  (~ INT16_MAX)
-#define INT16_MAX  32767
-#define UINT16_MAX  65535
+# undef INT16_MIN
+# undef INT16_MAX
+# undef UINT16_MAX
+# define INT16_MIN  (~ INT16_MAX)
+# define INT16_MAX  32767
+# define UINT16_MAX  65535
 
-#undef INT32_MIN
-#undef INT32_MAX
-#undef UINT32_MAX
-#define INT32_MIN  (~ INT32_MAX)
-#define INT32_MAX  2147483647
-#define UINT32_MAX  4294967295U
+# undef INT32_MIN
+# undef INT32_MAX
+# undef UINT32_MAX
+# define INT32_MIN  (~ INT32_MAX)
+# define INT32_MAX  2147483647
+# define UINT32_MAX  4294967295U
 
-#if defined GL_INT64_T && ! defined INT64_MAX
+# if defined GL_INT64_T && ! defined INT64_MAX
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
    evaluates the latter incorrectly in preprocessor expressions.  */
-# define INT64_MIN  (- INTMAX_C (1) << 63)
-# define INT64_MAX  INTMAX_C (9223372036854775807)
-#endif
+#  define INT64_MIN  (- INTMAX_C (1) << 63)
+#  define INT64_MAX  INTMAX_C (9223372036854775807)
+# endif
 
-#if defined GL_UINT64_T && ! defined UINT64_MAX
-# define UINT64_MAX  UINTMAX_C (18446744073709551615)
-#endif
+# if defined GL_UINT64_T && ! defined UINT64_MAX
+#  define UINT64_MAX  UINTMAX_C (18446744073709551615)
+# endif
 
 /* 7.18.2.2. Limits of minimum-width integer types */
 
@@ -386,38 +402,38 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
    types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
    are the same as the corresponding N_t types.  */
 
-#undef INT_LEAST8_MIN
-#undef INT_LEAST8_MAX
-#undef UINT_LEAST8_MAX
-#define INT_LEAST8_MIN  INT8_MIN
-#define INT_LEAST8_MAX  INT8_MAX
-#define UINT_LEAST8_MAX  UINT8_MAX
+# undef INT_LEAST8_MIN
+# undef INT_LEAST8_MAX
+# undef UINT_LEAST8_MAX
+# define INT_LEAST8_MIN  INT8_MIN
+# define INT_LEAST8_MAX  INT8_MAX
+# define UINT_LEAST8_MAX  UINT8_MAX
 
-#undef INT_LEAST16_MIN
-#undef INT_LEAST16_MAX
-#undef UINT_LEAST16_MAX
-#define INT_LEAST16_MIN  INT16_MIN
-#define INT_LEAST16_MAX  INT16_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
+# undef INT_LEAST16_MIN
+# undef INT_LEAST16_MAX
+# undef UINT_LEAST16_MAX
+# define INT_LEAST16_MIN  INT16_MIN
+# define INT_LEAST16_MAX  INT16_MAX
+# define UINT_LEAST16_MAX  UINT16_MAX
 
-#undef INT_LEAST32_MIN
-#undef INT_LEAST32_MAX
-#undef UINT_LEAST32_MAX
-#define INT_LEAST32_MIN  INT32_MIN
-#define INT_LEAST32_MAX  INT32_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
+# undef INT_LEAST32_MIN
+# undef INT_LEAST32_MAX
+# undef UINT_LEAST32_MAX
+# define INT_LEAST32_MIN  INT32_MIN
+# define INT_LEAST32_MAX  INT32_MAX
+# define UINT_LEAST32_MAX  UINT32_MAX
 
-#undef INT_LEAST64_MIN
-#undef INT_LEAST64_MAX
-#ifdef GL_INT64_T
-# define INT_LEAST64_MIN  INT64_MIN
-# define INT_LEAST64_MAX  INT64_MAX
-#endif
+# undef INT_LEAST64_MIN
+# undef INT_LEAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_LEAST64_MIN  INT64_MIN
+#  define INT_LEAST64_MAX  INT64_MAX
+# endif
 
-#undef UINT_LEAST64_MAX
-#ifdef GL_UINT64_T
-# define UINT_LEAST64_MAX  UINT64_MAX
-#endif
+# undef UINT_LEAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_LEAST64_MAX  UINT64_MAX
+# endif
 
 /* 7.18.2.3. Limits of fastest minimum-width integer types */
 
@@ -425,117 +441,121 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
    types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
    are taken from the same list of types.  */
 
-#undef INT_FAST8_MIN
-#undef INT_FAST8_MAX
-#undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  SCHAR_MIN
-#define INT_FAST8_MAX  SCHAR_MAX
-#define UINT_FAST8_MAX  UCHAR_MAX
+# undef INT_FAST8_MIN
+# undef INT_FAST8_MAX
+# undef UINT_FAST8_MAX
+# define INT_FAST8_MIN  SCHAR_MIN
+# define INT_FAST8_MAX  SCHAR_MAX
+# define UINT_FAST8_MAX  UCHAR_MAX
 
-#undef INT_FAST16_MIN
-#undef INT_FAST16_MAX
-#undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  INT_FAST32_MIN
-#define INT_FAST16_MAX  INT_FAST32_MAX
-#define UINT_FAST16_MAX  UINT_FAST32_MAX
+# undef INT_FAST16_MIN
+# undef INT_FAST16_MAX
+# undef UINT_FAST16_MAX
+# define INT_FAST16_MIN  INT_FAST32_MIN
+# define INT_FAST16_MAX  INT_FAST32_MAX
+# define UINT_FAST16_MAX  UINT_FAST32_MAX
 
-#undef INT_FAST32_MIN
-#undef INT_FAST32_MAX
-#undef UINT_FAST32_MAX
-#ifdef __sun
-# define INT_FAST32_MIN  INT_MIN
-# define INT_FAST32_MAX  INT_MAX
-# define UINT_FAST32_MAX  UINT_MAX
-#else
-# define INT_FAST32_MIN  LONG_MIN
-# define INT_FAST32_MAX  LONG_MAX
-# define UINT_FAST32_MAX  ULONG_MAX
-#endif
+# undef INT_FAST32_MIN
+# undef INT_FAST32_MAX
+# undef UINT_FAST32_MAX
+# ifdef __sun
+#  define INT_FAST32_MIN  INT_MIN
+#  define INT_FAST32_MAX  INT_MAX
+#  define UINT_FAST32_MAX  UINT_MAX
+# else
+#  define INT_FAST32_MIN  LONG_MIN
+#  define INT_FAST32_MAX  LONG_MAX
+#  define UINT_FAST32_MAX  ULONG_MAX
+# endif
 
-#undef INT_FAST64_MIN
-#undef INT_FAST64_MAX
-#ifdef GL_INT64_T
-# define INT_FAST64_MIN  INT64_MIN
-# define INT_FAST64_MAX  INT64_MAX
-#endif
+# undef INT_FAST64_MIN
+# undef INT_FAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_FAST64_MIN  INT64_MIN
+#  define INT_FAST64_MAX  INT64_MAX
+# endif
 
-#undef UINT_FAST64_MAX
-#ifdef GL_UINT64_T
-# define UINT_FAST64_MAX  UINT64_MAX
-#endif
+# undef UINT_FAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_FAST64_MAX  UINT64_MAX
+# endif
 
 /* 7.18.2.4. Limits of integer types capable of holding object pointers */
 
-#undef INTPTR_MIN
-#undef INTPTR_MAX
-#undef UINTPTR_MAX
-#define INTPTR_MIN  LONG_MIN
-#define INTPTR_MAX  LONG_MAX
-#define UINTPTR_MAX  ULONG_MAX
+# undef INTPTR_MIN
+# undef INTPTR_MAX
+# undef UINTPTR_MAX
+# define INTPTR_MIN  LONG_MIN
+# define INTPTR_MAX  LONG_MAX
+# define UINTPTR_MAX  ULONG_MAX
 
 /* 7.18.2.5. Limits of greatest-width integer types */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_MIN
-# ifdef INT64_MAX
-#  define INTMAX_MIN  INT64_MIN
-#  define INTMAX_MAX  INT64_MAX
-# else
-#  define INTMAX_MIN  INT32_MIN
-#  define INTMAX_MAX  INT32_MAX
+# ifndef INTMAX_MAX
+#  undef INTMAX_MIN
+#  ifdef INT64_MAX
+#   define INTMAX_MIN  INT64_MIN
+#   define INTMAX_MAX  INT64_MAX
+#  else
+#   define INTMAX_MIN  INT32_MIN
+#   define INTMAX_MAX  INT32_MAX
+#  endif
 # endif
-#endif
 
-#ifndef UINTMAX_MAX
-# ifdef UINT64_MAX
-#  define UINTMAX_MAX  UINT64_MAX
-# else
-#  define UINTMAX_MAX  UINT32_MAX
+# ifndef UINTMAX_MAX
+#  ifdef UINT64_MAX
+#   define UINTMAX_MAX  UINT64_MAX
+#  else
+#   define UINTMAX_MAX  UINT32_MAX
+#  endif
 # endif
-#endif
 
 /* 7.18.3. Limits of other integer types */
 
 /* ptrdiff_t limits */
-#undef PTRDIFF_MIN
-#undef PTRDIFF_MAX
-#if @APPLE_UNIVERSAL_BUILD@
-# ifdef _LP64
-#  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
-#  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+# undef PTRDIFF_MIN
+# undef PTRDIFF_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define PTRDIFF_MIN  _STDINT_SIGNED_MIN (64, 0l)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+#  else
+#   define PTRDIFF_MIN  _STDINT_SIGNED_MIN (32, 0)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
+#  endif
 # else
-#  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
-#  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
-# endif
-#else
-# define PTRDIFF_MIN  \
-    _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-# define PTRDIFF_MAX  \
+#  define PTRDIFF_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+#  define PTRDIFF_MAX  \
     _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-#endif
+# endif
 
 /* sig_atomic_t limits */
-#undef SIG_ATOMIC_MIN
-#undef SIG_ATOMIC_MAX
-#define SIG_ATOMIC_MIN  \
-   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
-                0@SIG_ATOMIC_T_SUFFIX@)
-#define SIG_ATOMIC_MAX  \
+# undef SIG_ATOMIC_MIN
+# undef SIG_ATOMIC_MAX
+# if @HAVE_SIGNED_SIG_ATOMIC_T@
+#  define SIG_ATOMIC_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@)
+# else
+#  define SIG_ATOMIC_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@)
+# endif
+# define SIG_ATOMIC_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
                 0@SIG_ATOMIC_T_SUFFIX@)
 
 
 /* size_t limit */
-#undef SIZE_MAX
-#if @APPLE_UNIVERSAL_BUILD@
-# ifdef _LP64
-#  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+# undef SIZE_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+#  else
+#   define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+#  endif
 # else
-#  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+#  define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
 # endif
-#else
-# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
-#endif
 
 /* wchar_t limits */
 /* Get WCHAR_MIN, WCHAR_MAX.
@@ -543,29 +563,39 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
    sequence of nested includes
    <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
    <stdint.h> and assumes its types are already defined.  */
-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
+# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-# include <wchar.h>
-# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-#endif
-#undef WCHAR_MIN
-#undef WCHAR_MAX
-#define WCHAR_MIN  \
-   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
-#define WCHAR_MAX  \
+#  include <stddef.h>
+#  include <stdio.h>
+#  include <time.h>
+#  define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+#  include <wchar.h>
+#  undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+# endif
+# undef WCHAR_MIN
+# undef WCHAR_MAX
+# if @HAVE_SIGNED_WCHAR_T@
+#  define WCHAR_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+# else
+#  define WCHAR_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+# endif
+# define WCHAR_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
 
 /* wint_t limits */
-#undef WINT_MIN
-#undef WINT_MAX
-#define WINT_MIN  \
-   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
-#define WINT_MAX  \
+# undef WINT_MIN
+# undef WINT_MAX
+# if @HAVE_SIGNED_WINT_T@
+#  define WINT_MIN  \
+    _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+# else
+#  define WINT_MIN  \
+    _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+# endif
+# define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
 /* 7.18.4. Macros for integer constants */
@@ -576,59 +606,120 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 /* Here we assume a standard architecture where the hardware integer
    types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
 
-#undef INT8_C
-#undef UINT8_C
-#define INT8_C(x) x
-#define UINT8_C(x) x
+# undef INT8_C
+# undef UINT8_C
+# define INT8_C(x) x
+# define UINT8_C(x) x
 
-#undef INT16_C
-#undef UINT16_C
-#define INT16_C(x) x
-#define UINT16_C(x) x
+# undef INT16_C
+# undef UINT16_C
+# define INT16_C(x) x
+# define UINT16_C(x) x
 
-#undef INT32_C
-#undef UINT32_C
-#define INT32_C(x) x
-#define UINT32_C(x) x ## U
+# undef INT32_C
+# undef UINT32_C
+# define INT32_C(x) x
+# define UINT32_C(x) x ## U
 
-#undef INT64_C
-#undef UINT64_C
-#if LONG_MAX >> 31 >> 31 == 1
-# define INT64_C(x) x##L
-#elif defined _MSC_VER
-# define INT64_C(x) x##i64
-#elif @HAVE_LONG_LONG_INT@
-# define INT64_C(x) x##LL
-#endif
-#if ULONG_MAX >> 31 >> 31 >> 1 == 1
-# define UINT64_C(x) x##UL
-#elif defined _MSC_VER
-# define UINT64_C(x) x##ui64
-#elif @HAVE_UNSIGNED_LONG_LONG_INT@
-# define UINT64_C(x) x##ULL
-#endif
+# undef INT64_C
+# undef UINT64_C
+# if LONG_MAX >> 31 >> 31 == 1
+#  define INT64_C(x) x##L
+# elif defined _MSC_VER
+#  define INT64_C(x) x##i64
+# elif @HAVE_LONG_LONG_INT@
+#  define INT64_C(x) x##LL
+# endif
+# if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#  define UINT64_C(x) x##UL
+# elif defined _MSC_VER
+#  define UINT64_C(x) x##ui64
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#  define UINT64_C(x) x##ULL
+# endif
 
 /* 7.18.4.2. Macros for greatest-width integer constants */
 
-#ifndef INTMAX_C
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define INTMAX_C(x)   x##LL
-# elif defined GL_INT64_T
-#  define INTMAX_C(x)   INT64_C(x)
-# else
-#  define INTMAX_C(x)   x##L
+# ifndef INTMAX_C
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#   define INTMAX_C(x)   x##LL
+#  elif defined GL_INT64_T
+#   define INTMAX_C(x)   INT64_C(x)
+#  else
+#   define INTMAX_C(x)   x##L
+#  endif
 # endif
-#endif
 
-#ifndef UINTMAX_C
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define UINTMAX_C(x)  x##ULL
-# elif defined GL_UINT64_T
-#  define UINTMAX_C(x)  UINT64_C(x)
-# else
-#  define UINTMAX_C(x)  x##UL
+# ifndef UINTMAX_C
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#   define UINTMAX_C(x)  x##ULL
+#  elif defined GL_UINT64_T
+#   define UINTMAX_C(x)  UINT64_C(x)
+#  else
+#   define UINTMAX_C(x)  x##UL
+#  endif
 # endif
-#endif
+
+#endif /* !@HAVE_C99_STDINT_H@ */
+
+/* Macros specified by ISO/IEC TS 18661-1:2014.  */
+
+#if (!defined UINTMAX_WIDTH \
+     && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__))
+# ifdef INT8_MAX
+#  define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX)
+# endif
+# ifdef UINT8_MAX
+#  define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX)
+# endif
+# ifdef INT16_MAX
+#  define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX)
+# endif
+# ifdef UINT16_MAX
+#  define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX)
+# endif
+# ifdef INT32_MAX
+#  define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX)
+# endif
+# ifdef UINT32_MAX
+#  define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX)
+# endif
+# ifdef INT64_MAX
+#  define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX)
+# endif
+# ifdef UINT64_MAX
+#  define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX)
+# endif
+# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX)
+# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX)
+# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX)
+# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX)
+# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX)
+# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX)
+# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX)
+# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX)
+# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX)
+# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX)
+# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX)
+# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX)
+# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX)
+# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX)
+# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX)
+# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX)
+# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX)
+# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX)
+# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX)
+# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX)
+# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX)
+# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX)
+# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX)
+# ifdef WINT_MAX
+#  define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX)
+# endif
+# ifdef SIG_ATOMIC_MAX
+#  define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX)
+# endif
+#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */
 
 #endif /* _@GUARD_PREFIX@_STDINT_H */
 #endif /* !(defined __ANDROID__ && ...) */
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 9b31365..d706377 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -118,6 +118,26 @@
 # include <unistd.h>
 #endif
 
+/* MSVC declares 'perror' in <stdlib.h>, not in <stdio.h>.  We must include
+   it before we  #define perror rpl_perror.  */
+/* But in any case avoid namespace pollution on glibc systems.  */
+#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \
+    && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+    && ! defined __GLIBC__
+# include <stdlib.h>
+#endif
+
+/* MSVC declares 'remove' in <io.h>, not in <stdio.h>.  We must include
+   it before we  #define remove rpl_remove.  */
+/* MSVC declares 'rename' in <io.h>, not in <stdio.h>.  We must include
+   it before we  #define rename rpl_rename.  */
+/* But in any case avoid namespace pollution on glibc systems.  */
+#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \
+    && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+    && ! defined __GLIBC__
+# include <io.h>
+#endif
+
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 70dc88d..b5cf9d3 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -521,6 +521,9 @@ _GL_CXXALIASWARN (putenv);
 #endif
 
 #if @GNULIB_QSORT_R@
+/* Sort an array of NMEMB elements, starting at address BASE, each element
+   occupying SIZE bytes, in ascending order according to the comparison
+   function COMPARE.  */
 # if @REPLACE_QSORT_R@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef qsort_r
@@ -535,12 +538,24 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                                   void *),
                                   void *arg));
 # else
+#  if !@HAVE_QSORT_R@
+_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+#  endif
 _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   int (*compare) (void const *, void const *,
                                                   void *),
                                   void *arg));
 # endif
 _GL_CXXALIASWARN (qsort_r);
+#elif defined GNULIB_POSIXCHECK
+# undef qsort_r
+# if HAVE_RAW_DECL_QSORT_R
+_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
+                 "use gnulib module qsort_r for portability");
+# endif
 #endif
 
 
diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index 0fe3161..8b02f94 100644
--- a/lib/str-two-way.h
+++ b/lib/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/lib/streq.h b/lib/streq.h
index 234f075..d40fc48 100644
--- a/lib/streq.h
+++ b/lib/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/striconv.c b/lib/striconv.c
index 0d9ccdc..d4efad2 100644
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2017 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/striconv.h b/lib/striconv.h
index e5217d7..fd3854c 100644
--- a/lib/striconv.h
+++ b/lib/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/string.in.h b/lib/string.in.h
index 7fb00c1..9a6b311 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -416,15 +416,15 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - "
 #   undef strndup
 #   define strndup rpl_strndup
 #  endif
-_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n)
+_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n)
                                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n));
+_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
 #  if ! @HAVE_DECL_STRNDUP@
-_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n)
+_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n)
                                    _GL_ARG_NONNULL ((1)));
 #  endif
-_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n));
+_GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
 _GL_CXXALIASWARN (strndup);
 #elif defined GNULIB_POSIXCHECK
@@ -444,17 +444,17 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - "
 #   undef strnlen
 #   define strnlen rpl_strnlen
 #  endif
-_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
+_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
+_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
-_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
+_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 #  endif
-_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
+_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen));
 # endif
 _GL_CXXALIASWARN (strnlen);
 #elif defined GNULIB_POSIXCHECK
diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index f5e0ffc..63f78a6 100644
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/strnlen1.h b/lib/strnlen1.h
index d3cd7c1..86cb177 100644
--- a/lib/strnlen1.h
+++ b/lib/strnlen1.h
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/strstr.c b/lib/strstr.c
index 60cd3e3..7870bb6 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2017 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -26,10 +26,6 @@
 
 #include <stdbool.h>
 
-#ifndef _LIBC
-# define __builtin_expect(expr, val)   (expr)
-#endif
-
 #define RETURN_TYPE char *
 #define AVAILABLE(h, h_l, j, n_l)                       \
   (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l))     \
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 72d9537..1831740 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -1,5 +1,5 @@
-/* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
+/* Provide a more complete sys/stat.h header file.
+   Copyright (C) 2005-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -72,6 +72,75 @@
 # define stat _stati64
 #endif
 
+/* Optionally, override 'struct stat' on native Windows.  */
+#if @GNULIB_OVERRIDES_STRUCT_STAT@
+
+# undef stat
+# if @GNULIB_STAT@
+#  define stat rpl_stat
+# else
+   /* Provoke a clear link error if stat() is used as a function and
+      module 'stat' is not in use.  */
+#  define stat stat_used_without_requesting_gnulib_module_stat
+# endif
+
+# if !GNULIB_defined_struct_stat
+struct stat
+{
+  dev_t st_dev;
+  ino_t st_ino;
+  mode_t st_mode;
+  nlink_t st_nlink;
+#  if 0
+  uid_t st_uid;
+#  else /* uid_t is not defined by default on native Windows.  */
+  short st_uid;
+#  endif
+#  if 0
+  gid_t st_gid;
+#  else /* gid_t is not defined by default on native Windows.  */
+  short st_gid;
+#  endif
+  dev_t st_rdev;
+  off_t st_size;
+#  if 0
+  blksize_t st_blksize;
+  blkcnt_t st_blocks;
+#  endif
+
+#  if @WINDOWS_STAT_TIMESPEC@
+  struct timespec st_atim;
+  struct timespec st_mtim;
+  struct timespec st_ctim;
+#  else
+  time_t st_atime;
+  time_t st_mtime;
+  time_t st_ctime;
+#  endif
+};
+#  if @WINDOWS_STAT_TIMESPEC@
+#   define st_atime st_atim.tv_sec
+#   define st_mtime st_mtim.tv_sec
+#   define st_ctime st_ctim.tv_sec
+    /* Indicator, for gnulib internal purposes.  */
+#   define _GL_WINDOWS_STAT_TIMESPEC 1
+#  endif
+#  define GNULIB_defined_struct_stat 1
+# endif
+
+/* Other possible values of st_mode.  */
+# if 0
+#  define _S_IFBLK  0x6000
+# endif
+# if 0
+#  define _S_IFLNK  0xA000
+# endif
+# if 0
+#  define _S_IFSOCK 0xC000
+# endif
+
+#endif
+
 #ifndef S_IFIFO
 # ifdef _S_IFIFO
 #  define S_IFIFO _S_IFIFO
@@ -345,6 +414,9 @@ _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
 # endif
 _GL_CXXALIASWARN (fstat);
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef fstat
+# define fstat fstat_used_without_requesting_gnulib_module_fstat
 #elif @WINDOWS_64_BIT_ST_SIZE@
 /* Above, we define stat to _stati64.  */
 # define fstat _fstati64
@@ -378,6 +450,9 @@ _GL_CXXALIAS_SYS (fstatat, int,
                   (int fd, char const *name, struct stat *st, int flags));
 # endif
 _GL_CXXALIASWARN (fstatat);
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef fstatat
+# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat
 #elif defined GNULIB_POSIXCHECK
 # undef fstatat
 # if HAVE_RAW_DECL_FSTATAT
@@ -476,6 +551,9 @@ _GL_CXXALIAS_SYS (lstat, int, (const char *name, struct stat *buf));
 # if @HAVE_LSTAT@
 _GL_CXXALIASWARN (lstat);
 # endif
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+# undef lstat
+# define lstat lstat_used_without_requesting_gnulib_module_lstat
 #elif defined GNULIB_POSIXCHECK
 # undef lstat
 # if HAVE_RAW_DECL_LSTAT
@@ -625,63 +703,69 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - "
 
 #if @GNULIB_STAT@
 # if @REPLACE_STAT@
-/* We can't use the object-like #define stat rpl_stat, because of
-   struct stat.  This means that rpl_stat will not be used if the user
-   does (stat)(a,b).  Oh well.  */
-#  if defined _AIX && defined stat && defined _LARGE_FILES
-    /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
-       so we have to replace stat64() instead of stat(). */
-#   undef stat64
-#   define stat64(name, st) rpl_stat (name, st)
-#  elif @WINDOWS_64_BIT_ST_SIZE@
-    /* Above, we define stat to _stati64.  */
-#   if defined __MINGW32__ && defined _stati64
-#    ifndef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat64.  */
-#     undef _stat64
-#     define _stat64(name, st) rpl_stat (name, st)
+#  if !@GNULIB_OVERRIDES_STRUCT_STAT@
+    /* We can't use the object-like #define stat rpl_stat, because of
+       struct stat.  This means that rpl_stat will not be used if the user
+       does (stat)(a,b).  Oh well.  */
+#   if defined _AIX && defined stat && defined _LARGE_FILES
+     /* With _LARGE_FILES defined, AIX (only) defines stat to stat64,
+        so we have to replace stat64() instead of stat(). */
+#    undef stat64
+#    define stat64(name, st) rpl_stat (name, st)
+#   elif @WINDOWS_64_BIT_ST_SIZE@
+     /* Above, we define stat to _stati64.  */
+#    if defined __MINGW32__ && defined _stati64
+#     ifndef _USE_32BIT_TIME_T
+       /* The system headers define _stati64 to _stat64.  */
+#      undef _stat64
+#      define _stat64(name, st) rpl_stat (name, st)
+#     endif
+#    elif defined _MSC_VER && defined _stati64
+#     ifdef _USE_32BIT_TIME_T
+       /* The system headers define _stati64 to _stat32i64.  */
+#      undef _stat32i64
+#      define _stat32i64(name, st) rpl_stat (name, st)
+#     else
+       /* The system headers define _stati64 to _stat64.  */
+#      undef _stat64
+#      define _stat64(name, st) rpl_stat (name, st)
+#     endif
+#    else
+#     undef _stati64
+#     define _stati64(name, st) rpl_stat (name, st)
 #    endif
-#   elif defined _MSC_VER && defined _stati64
+#   elif defined __MINGW32__ && defined stat
 #    ifdef _USE_32BIT_TIME_T
-      /* The system headers define _stati64 to _stat32i64.  */
+      /* The system headers define stat to _stat32i64.  */
 #     undef _stat32i64
 #     define _stat32i64(name, st) rpl_stat (name, st)
 #    else
-      /* The system headers define _stati64 to _stat64.  */
+      /* The system headers define stat to _stat64.  */
 #     undef _stat64
 #     define _stat64(name, st) rpl_stat (name, st)
 #    endif
-#   else
-#    undef _stati64
-#    define _stati64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined __MINGW32__ && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32i64.  */
-#    undef _stat32i64
-#    define _stat32i64(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64.  */
-#    undef _stat64
-#    define _stat64(name, st) rpl_stat (name, st)
-#   endif
-#  elif defined _MSC_VER && defined stat
-#   ifdef _USE_32BIT_TIME_T
-     /* The system headers define stat to _stat32.  */
-#    undef _stat32
-#    define _stat32(name, st) rpl_stat (name, st)
-#   else
-     /* The system headers define stat to _stat64i32.  */
-#    undef _stat64i32
-#    define _stat64i32(name, st) rpl_stat (name, st)
-#   endif
-#  else /* !(_AIX ||__MINGW32__ ||  _MSC_VER) */
-#   undef stat
-#   define stat(name, st) rpl_stat (name, st)
-#  endif /* !_LARGE_FILES */
+#   elif defined _MSC_VER && defined stat
+#    ifdef _USE_32BIT_TIME_T
+      /* The system headers define stat to _stat32.  */
+#     undef _stat32
+#     define _stat32(name, st) rpl_stat (name, st)
+#    else
+      /* The system headers define stat to _stat64i32.  */
+#     undef _stat64i32
+#     define _stat64i32(name, st) rpl_stat (name, st)
+#    endif
+#   else /* !(_AIX || __MINGW32__ || _MSC_VER) */
+#    undef stat
+#    define stat(name, st) rpl_stat (name, st)
+#   endif /* !_LARGE_FILES */
+#  endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */
 _GL_EXTERN_C int stat (const char *name, struct stat *buf)
                       _GL_ARG_NONNULL ((1, 2));
 # endif
+#elif @GNULIB_OVERRIDES_STRUCT_STAT@
+/* see above:
+  #define stat stat_used_without_requesting_gnulib_module_stat
+ */
 #elif defined GNULIB_POSIXCHECK
 # undef stat
 # if HAVE_RAW_DECL_STAT
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h
index 1623a1d..57739bc 100644
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -109,6 +109,13 @@ _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
                        (struct timeval *restrict, void *restrict));
 # endif
 _GL_CXXALIASWARN (gettimeofday);
+# if defined __cplusplus && defined GNULIB_NAMESPACE
+namespace GNULIB_NAMESPACE {
+  typedef ::timeval
+#undef timeval
+    timeval;
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef gettimeofday
 # if HAVE_RAW_DECL_GETTIMEOFDAY
diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h
index 8ab0545..3cea448 100644
--- a/lib/sys_types.in.h
+++ b/lib/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,6 +42,48 @@
 # define _GL_WINDOWS_64_BIT_OFF_T 1
 #endif
 
+/* Override dev_t and ino_t if distinguishable inodes support is requested
+   on native Windows.  */
+#if @WINDOWS_STAT_INODES@
+
+# if @WINDOWS_STAT_INODES@ == 2
+/* Experimental, not useful in Windows 10.  */
+
+/* Define dev_t to a 64-bit type.  */
+#  if !defined GNULIB_defined_dev_t
+typedef unsigned long long int rpl_dev_t;
+#   undef dev_t
+#   define dev_t rpl_dev_t
+#   define GNULIB_defined_dev_t 1
+#  endif
+
+/* Define ino_t to a 128-bit type.  */
+#  if !defined GNULIB_defined_ino_t
+/* MSVC does not have a 128-bit integer type.
+   GCC has a 128-bit integer type __int128, but only on 64-bit targets.  */
+typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t;
+#   undef ino_t
+#   define ino_t rpl_ino_t
+#   define GNULIB_defined_ino_t 1
+#  endif
+
+# else /* @WINDOWS_STAT_INODES@ == 1 */
+
+/* Define ino_t to a 64-bit type.  */
+#  if !defined GNULIB_defined_ino_t
+typedef unsigned long long int rpl_ino_t;
+#   undef ino_t
+#   define ino_t rpl_ino_t
+#   define GNULIB_defined_ino_t 1
+#  endif
+
+# endif
+
+/* Indicator, for gnulib internal purposes.  */
+# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@
+
+#endif
+
 /* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
diff --git a/lib/time.in.h b/lib/time.in.h
index 865c114..f0c7ef8 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -120,6 +120,24 @@ _GL_CXXALIAS_SYS (nanosleep, int,
 _GL_CXXALIASWARN (nanosleep);
 # endif
 
+/* Initialize time conversion information.  */
+# if @GNULIB_TZSET@
+#  if @REPLACE_TZSET@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef tzset
+#    define tzset rpl_tzset
+#   endif
+_GL_FUNCDECL_RPL (tzset, void, (void));
+_GL_CXXALIAS_RPL (tzset, void, (void));
+#  else
+#   if ! @HAVE_TZSET@
+_GL_FUNCDECL_SYS (tzset, void, (void));
+#   endif
+_GL_CXXALIAS_SYS (tzset, void, (void));
+#  endif
+_GL_CXXALIASWARN (tzset);
+# endif
+
 /* Return the 'time_t' representation of TP and normalize TP.  */
 # if @GNULIB_MKTIME@
 #  if @REPLACE_MKTIME@
@@ -187,7 +205,7 @@ _GL_CXXALIASWARN (gmtime_r);
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
    <http://www.opengroup.org/susv3xsh/localtime.html> and
    <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
-# if @GNULIB_GETTIMEOFDAY@
+# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@
 #  if @REPLACE_LOCALTIME@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef localtime
@@ -202,7 +220,7 @@ _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
 _GL_CXXALIASWARN (localtime);
 # endif
 
-# if @GNULIB_GETTIMEOFDAY@
+# if 0 || @REPLACE_GMTIME@
 #  if @REPLACE_GMTIME@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef gmtime
@@ -217,7 +235,7 @@ _GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
 _GL_CXXALIASWARN (gmtime);
 # endif
 
-/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
+/* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store
    the resulting broken-down time into TM.  See
    <http://www.opengroup.org/susv3xsh/strptime.html>.  */
 # if @GNULIB_STRPTIME@
@@ -233,6 +251,41 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
 _GL_CXXALIASWARN (strptime);
 # endif
 
+/* Convert *TP to a date and time string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ctime.html>.  */
+# if @GNULIB_CTIME@
+#  if @REPLACE_CTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define ctime rpl_ctime
+#   endif
+_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp));
+#  else
+_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp));
+#  endif
+_GL_CXXALIASWARN (ctime);
+# endif
+
+/* Convert *TP to a date and time string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html>.  */
+# if @GNULIB_STRFTIME@
+#  if @REPLACE_STRFTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define strftime rpl_strftime
+#   endif
+_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp));
+#  else
+_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize,
+                                     const char *__fmt, const struct tm *__tp));
+#  endif
+_GL_CXXALIASWARN (strftime);
+# endif
+
 # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@
 typedef struct tm_zone *timezone_t;
 _GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name));
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index c3af07a..f366caf 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2016 Free Software Foundation, Inc.
+   Copyright (C) 2003-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,9 +55,13 @@
 #include <stddef.h>
 
 /* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>.  */
+/* MSVC declares 'unlink' in <stdio.h>, not in <unistd.h>.  We must include
+   it before we  #define unlink rpl_unlink.  */
 /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
+     || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \
+         && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \
      || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
          && defined __CYGWIN__)) \
     && ! defined __GLIBC__
@@ -123,11 +127,18 @@
 # include <sys/types.h>
 #endif
 
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
 /* Get getopt(), optarg, optind, opterr, optopt.
    But avoid namespace pollution on glibc systems.  */
 #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
-# define __need_getopt
-# include <getopt.h>
+# include <getopt-cdefs.h>
+# include <getopt-pfx-core.h>
 #endif
 
 #ifndef _GL_INLINE_HEADER_BEGIN
@@ -138,13 +149,6 @@ _GL_INLINE_HEADER_BEGIN
 # define _GL_UNISTD_INLINE _GL_INLINE
 #endif
 
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-
 /* Hide some function declarations from <winsock2.h>.  */
 
 #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
@@ -776,7 +780,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if !@HAVE_GETLOGIN@
+# if !@HAVE_DECL_GETLOGIN@
 _GL_FUNCDECL_SYS (getlogin, char *, (void));
 # endif
 _GL_CXXALIAS_SYS (getlogin, char *, (void));
@@ -1453,6 +1457,36 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - "
 #endif
 
 
+#if @GNULIB_TRUNCATE@
+/* Change the size of the file designated by FILENAME to become equal to LENGTH.
+   Return 0 if successful, otherwise -1 and errno set.
+   See the POSIX:2008 specification
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/truncate.html>.  */
+# if @REPLACE_TRUNCATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef truncate
+#   define truncate rpl_truncate
+#  endif
+_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length));
+# else
+#  if !@HAVE_TRUNCATE@
+_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length)
+                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
+# endif
+_GL_CXXALIASWARN (truncate);
+#elif defined GNULIB_POSIXCHECK
+# undef truncate
+# if HAVE_RAW_DECL_TRUNCATE
+_GL_WARN_ON_USE (truncate, "truncate is unportable - "
+                 "use gnulib module truncate for portability");
+# endif
+#endif
+
+
 #if @GNULIB_TTYNAME_R@
 /* Store at most BUFLEN characters of the pathname of the terminal FD is
    open on in BUF.  Return 0 on success, otherwise an error number.  */
diff --git a/lib/unistr.in.h b/lib/unistr.in.h
index 70aa9cb..0f330af 100644
--- a/lib/unistr.in.h
+++ b/lib/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -197,15 +197,11 @@ u32_mbtouc_unsafe (ucs4_t *puc,
 {
   uint32_t c = *s;
 
-#  if CONFIG_UNICODE_SAFETY
   if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
-#  endif
     *puc = c;
-#  if CONFIG_UNICODE_SAFETY
   else
     /* invalid multibyte character */
     *puc = 0xfffd;
-#  endif
   return 1;
 }
 # endif
diff --git a/lib/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c
index 48f9ca3..3f2f386 100644
--- a/lib/unistr/u8-mbtoucr.c
+++ b/lib/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
@@ -92,10 +92,7 @@ u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n)
             {
               if ((s[1] ^ 0x80) < 0x40
                   && (c >= 0xf1 || s[1] >= 0x90)
-#if 1
-                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
-#endif
-                 )
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90)))
                 {
                   if (n >= 3)
                     {
@@ -138,146 +135,6 @@ u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n)
               return -2;
             }
         }
-#if 0
-      else if (c < 0xfc)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xf9 || s[1] >= 0x88))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          *puc = ((unsigned int) (c & 0x03) << 24)
-                                                 | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                                 | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                                 | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                                 | (unsigned int) (s[4] ^ 0x80);
-                                          return 5;
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-      else if (c < 0xfe)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xfd || s[1] >= 0x84))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          if (n >= 6)
-                                            {
-                                              if ((s[5] ^ 0x80) < 0x40)
-                                                {
-                                                  *puc = ((unsigned int) (c & 0x01) << 30)
-                                                         | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                                         | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                                         | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                                         | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                                         | (unsigned int) (s[5] ^ 0x80);
-                                                  return 6;
-                                                }
-                                              /* invalid multibyte character */
-                                            }
-                                          else
-                                            {
-                                              /* incomplete multibyte character */
-                                              *puc = 0xfffd;
-                                              return -2;
-                                            }
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-#endif
     }
   /* invalid multibyte character */
   *puc = 0xfffd;
diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c
index d5ff1d6..ba358ed 100644
--- a/lib/unistr/u8-uctomb-aux.c
+++ b/lib/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -20,6 +20,14 @@
 /* Specification.  */
 #include "unistr.h"
 
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
 int
 u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
 {
@@ -37,17 +45,8 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
       else
         return -1;
     }
-#if 0
-  else if (uc < 0x200000)
-    count = 4;
-  else if (uc < 0x4000000)
-    count = 5;
-  else if (uc <= 0x7fffffff)
-    count = 6;
-#else
   else if (uc < 0x110000)
     count = 4;
-#endif
   else
     return -1;
 
@@ -56,12 +55,10 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
 
   switch (count) /* note: code falls through cases! */
     {
-#if 0
-    case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-    case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
     case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
+      FALLTHROUGH;
     case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;
+      FALLTHROUGH;
     case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0;
   /*case 1:*/ s[0] = uc;
     }
diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c
index 419a6b4..685b6f1 100644
--- a/lib/unistr/u8-uctomb.c
+++ b/lib/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -52,17 +52,8 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n)
           else
             return -1;
         }
-#if 0
-      else if (uc < 0x200000)
-        count = 4;
-      else if (uc < 0x4000000)
-        count = 5;
-      else if (uc <= 0x7fffffff)
-        count = 6;
-#else
       else if (uc < 0x110000)
         count = 4;
-#endif
       else
         return -1;
 
@@ -70,10 +61,6 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n)
         {
           switch (count) /* note: code falls through cases! */
             {
-#if 0
-            case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-            case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
             case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
             case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;
             case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0;
diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h
index c6ca0ba..8733079 100644
--- a/lib/unitypes.in.h
+++ b/lib/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/verify.h b/lib/verify.h
index 2f43837..dcba9c8 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -248,7 +248,12 @@ template <int w>
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */
 
-#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#ifdef __GNUC__
+# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#else
+/* PGI barfs if R is long.  Play it safe.  */
+# define verify(R) _GL_VERIFY (R, "verify (...)")
+#endif
 
 #ifndef __has_builtin
 # define __has_builtin(x) 0
@@ -263,7 +268,7 @@ template <int w>
 # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
 #elif 1200 <= _MSC_VER
 # define assume(R) __assume (R)
-#elif (defined lint \
+#elif ((defined GCC_LINT || defined lint) \
        && (__has_builtin (__builtin_trap) \
            || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
   /* Doing it this way helps various packages when configured with
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index e98ab61..56eba3c 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,10 +31,11 @@
 @PRAGMA_COLUMNS@
 
 #if (((defined __need_mbstate_t || defined __need_wint_t)               \
-      && !defined __MINGW32__)                                          \
+      && !defined __MINGW32__ && !defined __KLIBC__)                    \
      || (defined __hpux                                                 \
          && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
+     || (defined __MINGW32__ && defined __STRING_H_SOURCED__)           \
      || defined _GL_ALREADY_INCLUDING_WCHAR_H)
 /* Special invocation convention:
    - Inside glibc and uClibc header files, but not MinGW.
@@ -44,6 +45,8 @@
      and once directly.  In both situations 'wint_t' is not yet defined,
      therefore we cannot provide the function overrides; instead include only
      the system's <wchar.h>.
+   - With MinGW 3.22, when <string.h> includes <wchar.h>, only some part of
+     <wchar.h> is actually processed, and that doesn't include 'mbstate_t'.
    - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
      the latter includes <wchar.h>.  But here, we have no way to detect whether
      <wctype.h> is completely included or is still being included.  */
@@ -110,12 +113,16 @@
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
+/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or
+   <stddef.h>.  This is too small: ISO C 99 section 7.24.1.(2) says that
+   wint_t must be "unchanged by default argument promotions".  Override it.  */
+# if @GNULIB_OVERRIDES_WINT_T@
 #  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
+#   if @HAVE_CRTDEFS_H@
+#    include <crtdefs.h>
+#   else
+#    include <stddef.h>
+#   endif
 typedef unsigned int rpl_wint_t;
 #   undef wint_t
 #   define wint_t rpl_wint_t
@@ -445,6 +452,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
 _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+#  elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+   static inline function.  The implementation of wcwidth in wcwidth.c
+   causes a "conflicting types" error. */
+#   undef wcwidth
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
@@ -1028,6 +1040,38 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
 #endif
 
 
+/* Convert *TP to a date and time wide string.  See
+   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/wcsftime.html>.  */
+#if @GNULIB_WCSFTIME@
+# if @REPLACE_WCSFTIME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsftime
+#   define wcsftime rpl_wcsftime
+#  endif
+_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp));
+# else
+#  if !@HAVE_WCSFTIME@
+_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp)
+                                    _GL_ARG_NONNULL ((1, 3, 4)));
+#  endif
+_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize,
+                                     const wchar_t *__fmt, const struct tm *__tp));
+# endif
+_GL_CXXALIASWARN (wcsftime);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsftime
+# if HAVE_RAW_DECL_WCSFTIME
+_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - "
+                 "use gnulib module wcsftime for portability");
+# endif
+#endif
+
+
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif
diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c
index b931ee9..f956ecf 100644
--- a/lib/wcrtomb.c
+++ b/lib/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wcsdup-impl.h b/lib/wcsdup-impl.h
index cffcf89..34d0fbf 100644
--- a/lib/wcsdup-impl.h
+++ b/lib/wcsdup-impl.h
@@ -1,5 +1,5 @@
 /* Duplicate a wide string.
-   Copyright (C) 1999, 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 1999.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wcsdup.c b/lib/wcsdup.c
index 0546df3..e1dee21 100644
--- a/lib/wcsdup.c
+++ b/lib/wcsdup.c
@@ -1,5 +1,5 @@
 /* Duplicate a wide string.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wctob.c b/lib/wctob.c
index 15e3ff3..ab320cf 100644
--- a/lib/wctob.c
+++ b/lib/wctob.c
@@ -1,5 +1,5 @@
 /* Convert wide character to unibyte character.
-   Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wctomb-impl.h b/lib/wctomb-impl.h
index a6ed971..f76b595 100644
--- a/lib/wctomb-impl.h
+++ b/lib/wctomb-impl.h
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wctomb.c b/lib/wctomb.c
index f1d14f5..724ce4f 100644
--- a/lib/wctomb.c
+++ b/lib/wctomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wctype.in.h b/lib/wctype.in.h
index 3431854..3a9e26c 100644
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
+   Copyright (C) 2006-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,13 +25,25 @@
  * wctrans_t, and wctype_t are not yet implemented.
  */
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
-
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
 @PRAGMA_COLUMNS@
 
+#if (defined __MINGW32__ && defined __CTYPE_H_SOURCED__)
+
+/* Special invocation convention:
+   - With MinGW 3.22, when <ctype.h> includes <wctype.h>, only some part of
+     <wctype.h> is being processed, which doesn't include the idempotency
+     guard.   */
+
+#@INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
+
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
    Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -44,11 +56,13 @@
 # include <wchar.h>
 #endif
 
-/* mingw has declarations of towupper and towlower in <ctype.h> as
-   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
-   being added to the declarations.  */
-#ifdef __MINGW32__
+/* Native Windows (mingw, MSVC) have declarations of towupper, towlower, and
+   isw* functions in <ctype.h>, <wchar.h> as well as in <wctype.h>.  Include
+   <ctype.h>, <wchar.h> in advance to avoid rpl_ prefix being added to the
+   declarations.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # include <ctype.h>
+# include <wchar.h>
 #endif
 
 /* Include the original <wctype.h> if it exists.
@@ -93,12 +107,16 @@ _GL_INLINE_HEADER_BEGIN
 #  define WEOF -1
 # endif
 #else
-/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>.
-   This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be
-   "unchanged by default argument promotions".  Override it.  */
-# if defined _MSC_VER
+/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or
+   <stddef.h>.  This is too small: ISO C 99 section 7.24.1.(2) says that
+   wint_t must be "unchanged by default argument promotions".  Override it.  */
+# if @GNULIB_OVERRIDES_WINT_T@
 #  if !GNULIB_defined_wint_t
-#   include <crtdefs.h>
+#   if @HAVE_CRTDEFS_H@
+#    include <crtdefs.h>
+#   else
+#    include <stddef.h>
+#   endif
 typedef unsigned int rpl_wint_t;
 #   undef wint_t
 #   define wint_t rpl_wint_t
@@ -512,3 +530,4 @@ _GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_WCTYPE_H */
 #endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif
diff --git a/lib/wmemcpy-impl.h b/lib/wmemcpy-impl.h
index fe68daf..d0ff48c 100644
--- a/lib/wmemcpy-impl.h
+++ b/lib/wmemcpy-impl.h
@@ -1,5 +1,5 @@
 /* Copy wide character array.
-   Copyright (C) 1999, 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 1999.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wmemcpy.c b/lib/wmemcpy.c
index 1b5a79b..075b4ef 100644
--- a/lib/wmemcpy.c
+++ b/lib/wmemcpy.c
@@ -1,5 +1,5 @@
 /* Copy wide character array.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4
index bb37e32..bb3512f 100644
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 9ba602b..ab1d8d2 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -17,12 +17,12 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
 # Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id: Makefile.am 663 2016-01-04 22:25:51Z john $
+# $Id: 0a91dfe2dd08e547ef46fe02dc4bc92a8cf54ebe $
 #
 # This file, m4/Makefile.am, contains the m4 macro directory Makefile for
 # Star Traders.  It needs to be processed by automake to produce the
@@ -123,32 +123,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \
-	$(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
-	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
-	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
-	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \
-	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ssize_t.m4 \
-	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
-	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -207,7 +211,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -216,6 +221,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
@@ -228,6 +234,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
@@ -294,6 +301,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -335,6 +343,8 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
 GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
@@ -383,6 +393,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -404,7 +415,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
@@ -434,6 +447,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
 GNULIB_WCSCPY = @GNULIB_WCSCPY@
 GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
 GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
 GNULIB_WCSLEN = @GNULIB_WCSLEN@
 GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
 GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
@@ -464,8 +478,10 @@ GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
@@ -476,6 +492,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
@@ -565,6 +582,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -598,6 +616,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
@@ -605,6 +624,8 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
@@ -626,6 +647,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@
 HAVE_WCSCPY = @HAVE_WCSCPY@
 HAVE_WCSCSPN = @HAVE_WCSCSPN@
 HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
 HAVE_WCSLEN = @HAVE_WCSLEN@
 HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
 HAVE_WCSNCAT = @HAVE_WCSNCAT@
@@ -674,6 +696,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
@@ -682,6 +705,7 @@ LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
@@ -689,6 +713,7 @@ MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -704,6 +729,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -726,6 +752,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -737,6 +766,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -832,6 +862,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -846,7 +877,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
@@ -859,6 +892,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
@@ -886,6 +920,8 @@ VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -894,7 +930,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -910,6 +945,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+desktopdir = @desktopdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -924,6 +960,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+iconsdir = @iconsdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -960,7 +997,7 @@ EXTRA_DIST = \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -984,9 +1021,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 tags TAGS:
diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
index 7ffc38d..c73adc8 100644
--- a/m4/absolute-header.m4
+++ b/m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/assert.m4 b/m4/assert.m4
index 054b163..3485b7d 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,6 +1,6 @@
 #serial 7
 
-# Copyright (C) 1998-1999, 2001, 2004, 2008-2016 Free Software Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2004, 2008-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 47e8fd8..1021809 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,5 +1,5 @@
 # btowc.m4 serial 10
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4
new file mode 100644
index 0000000..aa3364b
--- /dev/null
+++ b/m4/builtin-expect.m4
@@ -0,0 +1,49 @@
+dnl Check for __builtin_expect.
+
+dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl___BUILTIN_EXPECT],
+[
+  AC_CACHE_CHECK([for __builtin_expect],
+    [gl_cv___builtin_expect],
+    [AC_LINK_IFELSE(
+       [AC_LANG_SOURCE([[
+         int
+         main (int argc, char **argv)
+         {
+           argc = __builtin_expect (argc, 100);
+           return argv[argc != 100][0];
+         }]])],
+       [gl_cv___builtin_expect=yes],
+       [AC_LINK_IFELSE(
+          [AC_LANG_SOURCE([[
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }]])],
+          [gl_cv___builtin_expect="in <builtins.h>"],
+          [gl_cv___builtin_expect=no])])])
+  if test "$gl_cv___builtin_expect" = yes; then
+    AC_DEFINE([HAVE___BUILTIN_EXPECT], [1])
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    AC_DEFINE([HAVE___BUILTIN_EXPECT], [2])
+  fi
+  AH_VERBATIM([HAVE___BUILTIN_EXPECT],
+    [/* Define to 1 if the compiler supports __builtin_expect,
+   and to 2 if <builtins.h> does.  */
+#undef HAVE___BUILTIN_EXPECT
+#ifndef HAVE___BUILTIN_EXPECT
+# define __builtin_expect(e, c) (e)
+#elif HAVE___BUILTIN_EXPECT == 2
+# include <builtins.h>
+#endif
+    ])
+])
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index d7de8d6..bc98201 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,6 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/config-h.m4 b/m4/config-h.m4
index d6664b7..6e6e661 100644
--- a/m4/config-h.m4
+++ b/m4/config-h.m4
@@ -1,6 +1,6 @@
 # Say that -DHAVE_CONFIG_H is not needed.
 
-dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/configmake.m4 b/m4/configmake.m4
index 80b9254..b783296 100644
--- a/m4/configmake.m4
+++ b/m4/configmake.m4
@@ -1,5 +1,5 @@
 # configmake.m4 serial 2
-dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 6d378ec..c60f537 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,7 +1,7 @@
-# serial 13  -*- Autoconf -*-
+# serial 15  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -60,7 +60,7 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on OS X.  */
+/* Enable general extensions on macOS.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
 #endif
@@ -68,14 +68,38 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Use GNU style printf and scanf.  */
-#ifndef __USE_MINGW_ANSI_STDIO
-# undef __USE_MINGW_ANSI_STDIO
-#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
@@ -104,8 +128,14 @@ dnl configure.ac when using autoheader 2.62.
   AC_DEFINE([_ALL_SOURCE])
   AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
-  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__])
+  AC_DEFINE([__STDC_WANT_LIB_EXT2__])
+  AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__])
   AC_DEFINE([_TANDEM_SOURCE])
   AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
     [ac_cv_should_define__xopen_source],
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index fe282a5..00f9609 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2016 Free Software Foundation, Inc.
+dnl Copyright 2012-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -54,6 +54,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
index 24fcf88..3c3b63c 100644
--- a/m4/fcntl-o.m4
+++ b/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index ce6ec67..3ebc7b7 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
-# getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2016 Free Software Foundation, Inc.
+# getopt.m4 serial 46
+dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -32,9 +32,16 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
 # getopt_long_only.
 AC_DEFUN([gl_FUNC_GETOPT_GNU],
 [
+  dnl Set the variable gl_getopt_required, so that all invocations of
+  dnl gl_GETOPT_CHECK_HEADERS in the scope of the current configure file
+  dnl will check for getopt with GNU extensions.
+  dnl This means that if one gnulib-tool invocation requests getopt-posix
+  dnl and another gnulib-tool invocation requests getopt-gnu, it is as if
+  dnl both had requested getopt-gnu.
   m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU])
 
-  AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
+  dnl No need to invoke gl_FUNC_GETOPT_POSIX here; this is automatically
+  dnl done through the module dependency getopt-gnu -> getopt-posix.
 ])
 
 # Determine whether to replace the entire getopt facility.
@@ -354,15 +361,19 @@ dnl is ambiguous with environment values that contain newlines.
 
 AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
 [
-  GETOPT_H=getopt.h
+  AC_CHECK_HEADERS_ONCE([sys/cdefs.h])
+  if test $ac_cv_header_sys_cdefs_h = yes; then
+    HAVE_SYS_CDEFS_H=1
+  else
+    HAVE_SYS_CDEFS_H=0
+  fi
+  AC_SUBST([HAVE_SYS_CDEFS_H])
+
   AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
     [Define to rpl_ if the getopt replacement functions and variables
      should be used.])
+  GETOPT_H=getopt.h
+  GETOPT_CDEFS_H=getopt-cdefs.h
   AC_SUBST([GETOPT_H])
-])
-
-# Prerequisites of lib/getopt*.
-AC_DEFUN([gl_PREREQ_GETOPT],
-[
-  AC_CHECK_DECLS_ONCE([getenv])
+  AC_SUBST([GETOPT_CDEFS_H])
 ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index da31efe..eef5073 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 67 (gettext-0.19.6)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -161,13 +161,18 @@ changequote([,])dnl
             [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                ]],
                [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ]])],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
@@ -193,17 +198,22 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
               [AC_LANG_PROGRAM(
                  [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                  ]],
                  [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                  ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
@@ -214,17 +224,22 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
                 [AC_LANG_PROGRAM(
                    [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                    ]],
                    [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                    ]])],
                 [LIBINTL="$LIBINTL $LIBICONV"
                  LTLIBINTL="$LTLIBINTL $LTLIBICONV"
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 4ae5d63..8ee206e 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,6 +1,6 @@
-# serial 21
+# serial 23
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,9 +9,10 @@ dnl From Jim Meyering.
 
 AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
 [
-  AC_REQUIRE([AC_C_RESTRICT])
-  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
   AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
+  AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
   AC_CHECK_FUNCS_ONCE([gettimeofday])
 
   gl_gettimeofday_timezone=void
@@ -54,19 +55,11 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict);
     if test $REPLACE_STRUCT_TIMEVAL = 1; then
       REPLACE_GETTIMEOFDAY=1
     fi
-    m4_ifdef([gl_FUNC_TZSET_CLOBBER], [
-      gl_FUNC_TZSET_CLOBBER
-      case "$gl_cv_func_tzset_clobber" in
-        *yes)
-          REPLACE_GETTIMEOFDAY=1
-          gl_GETTIMEOFDAY_REPLACE_LOCALTIME
-          AC_DEFINE([tzset], [rpl_tzset],
-            [Define to rpl_tzset if the wrapper function should be used.])
-          AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1],
-            [Define if tzset clobbers localtime's static buffer.])
-          ;;
-      esac
-    ])
+    dnl On mingw, the original gettimeofday has only a precision of 15.6
+    dnl milliseconds. So override it.
+    case "$host_os" in
+      mingw*) REPLACE_GETTIMEOFDAY=1 ;;
+    esac
   fi
   AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
     [Define this to 'void' or 'struct timezone' to match the system's
@@ -85,6 +78,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
 [
  AC_REQUIRE([gl_HEADER_SYS_TIME_H])
  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
 
  AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
   [gl_cv_func_gettimeofday_clobber],
@@ -119,20 +113,12 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
  case "$gl_cv_func_gettimeofday_clobber" in
    *yes)
      REPLACE_GETTIMEOFDAY=1
-     gl_GETTIMEOFDAY_REPLACE_LOCALTIME
      AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1],
        [Define if gettimeofday clobbers the localtime buffer.])
+     gl_LOCALTIME_BUFFER_NEEDED
      ;;
  esac
 ])
 
-AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
-  REPLACE_GMTIME=1
-  REPLACE_LOCALTIME=1
-])
-
 # Prerequisites of lib/gettimeofday.c.
-AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [
-  AC_CHECK_HEADERS([sys/timeb.h])
-  AC_CHECK_FUNCS([_ftime])
-])
+AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:])
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index dafebf5..2e30ed6 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,5 +1,5 @@
 # glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2016 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index f8454c8..36f2acc 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 38
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -256,7 +256,8 @@ AC_DEFUN([gl_PROG_AR_RANLIB],
   dnl library formats. In particular, the GNU binutils programs ar and ranlib
   dnl produce libraries that work only with gcc, not with cc.
   AC_REQUIRE([AC_PROG_CC])
-  AC_BEFORE([$0], [AM_PROG_AR])
+  dnl The '][' hides this use from 'aclocal'.
+  AC_BEFORE([$0], [A][M_PROG_AR])
   AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
     [
       AC_EGREP_CPP([Amsterdam],
@@ -288,7 +289,9 @@ Amsterdam
     dnl __ACK__.  It may seem like its easier to avoid calling the macro here,
     dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good
     dnl default value and automake should usually know them).
-    m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [:])
+    dnl
+    dnl The '][' hides this use from 'aclocal'.
+    m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:])
   fi
 
   dnl In case the code above has not helped with setting AR/ARFLAGS, use
@@ -456,7 +459,9 @@ m4_ifndef([AC_PROG_SED],
      else
        ac_cv_path_SED=$SED
      fi
+    ])
  SED="$ac_cv_path_SED"
  AC_SUBST([SED])dnl
  rm -f conftest.sed
-])])])
+])
+])
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index ce13e20..dedb5eb 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,6 +46,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module absolute-header:
   # Code from module assert:
   # Code from module btowc:
+  # Code from module builtin-expect:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module config-h:
@@ -59,14 +60,17 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
   # Code from module iconv_open:
   # Code from module include_next:
   # Code from module inline:
+  # Code from module limits-h:
   # Code from module localcharset:
   # Code from module locale:
+  # Code from module localtime-buffer:
   # Code from module mbrtowc:
   # Code from module mbsinit:
   # Code from module mbsrtowcs:
@@ -133,24 +137,18 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_BTOWC
   fi
   gl_WCHAR_MODULE_INDICATOR([btowc])
+  gl___BUILTIN_EXPECT
   gl_CONFIG_H
   gl_CONFIGMAKE_PREP
   AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FUNC_GETOPT_GNU
-  if test $REPLACE_GETOPT = 1; then
-    AC_LIBOBJ([getopt])
-    AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
-    dnl Arrange for unistd.h to include getopt.h.
-    GNULIB_GL_UNISTD_H_GETOPT=1
-  fi
-  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
-  gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+  dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required
+  dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are
+  dnl done in the getopt-posix module.
   gl_FUNC_GETOPT_POSIX
   if test $REPLACE_GETOPT = 1; then
     AC_LIBOBJ([getopt])
     AC_LIBOBJ([getopt1])
-    gl_PREREQ_GETOPT
     dnl Arrange for unistd.h to include getopt.h.
     GNULIB_GL_UNISTD_H_GETOPT=1
   fi
@@ -165,6 +163,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -178,10 +177,13 @@ AC_DEFUN([gl_INIT],
     AC_LIBOBJ([iconv_close])
   fi
   gl_INLINE
+  gl_LIMITS_H
   gl_LOCALCHARSET
   LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
   gl_LOCALE_H
+  AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+  AC_LIBOBJ([localtime-buffer])
   gl_FUNC_MBRTOWC
   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
     AC_LIBOBJ([mbrtowc])
@@ -419,12 +421,10 @@ AC_DEFUN([gltests_LIBSOURCES], [
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
   build-aux/config.rpath
-  build-aux/snippet/_Noreturn.h
-  build-aux/snippet/arg-nonnull.h
-  build-aux/snippet/c++defs.h
-  build-aux/snippet/unused-parameter.h
-  build-aux/snippet/warn-on-use.h
+  lib/_Noreturn.h
+  lib/arg-nonnull.h
   lib/btowc.c
+  lib/c++defs.h
   lib/c-ctype.c
   lib/c-ctype.h
   lib/c-strcase.h
@@ -433,12 +433,19 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/config.charset
   lib/crc.c
   lib/crc.h
+  lib/getopt-cdefs.in.h
+  lib/getopt-core.h
+  lib/getopt-ext.h
+  lib/getopt-pfx-core.h
+  lib/getopt-pfx-ext.h
   lib/getopt.c
   lib/getopt.in.h
   lib/getopt1.c
   lib/getopt_int.h
   lib/gettext.h
   lib/gettimeofday.c
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/iconv.c
   lib/iconv.in.h
   lib/iconv_close.c
@@ -448,9 +455,12 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/iconv_open-osf.gperf
   lib/iconv_open-solaris.gperf
   lib/iconv_open.c
+  lib/limits.in.h
   lib/localcharset.c
   lib/localcharset.h
   lib/locale.in.h
+  lib/localtime-buffer.c
+  lib/localtime-buffer.h
   lib/mbrtowc.c
   lib/mbsinit.c
   lib/mbsrtowcs-impl.h
@@ -486,7 +496,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unistr/u8-uctomb-aux.c
   lib/unistr/u8-uctomb.c
   lib/unitypes.in.h
+  lib/unused-parameter.h
   lib/verify.h
+  lib/warn-on-use.h
   lib/wchar.in.h
   lib/wcrtomb.c
   lib/wcsdup-impl.h
@@ -502,6 +514,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/absolute-header.m4
   m4/assert.m4
   m4/btowc.m4
+  m4/builtin-expect.m4
   m4/codeset.m4
   m4/config-h.m4
   m4/configmake.m4
@@ -514,6 +527,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/glibc2.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
@@ -531,11 +545,13 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/lib-link.m4
   m4/lib-prefix.m4
   m4/libunistring-base.m4
+  m4/limits-h.m4
   m4/localcharset.m4
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-zh.m4
   m4/locale_h.m4
+  m4/localtime-buffer.m4
   m4/lock.m4
   m4/longlong.m4
   m4/mbrtowc.m4
diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
new file mode 100644
index 0000000..d79acd6
--- /dev/null
+++ b/m4/hard-locale.m4
@@ -0,0 +1,11 @@
+# hard-locale.m4 serial 8
+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl No prerequisites of lib/hard-locale.c.
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  :
+])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 4e37363..bdafc54 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
-# iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+# iconv.m4 serial 20
+dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -258,14 +258,18 @@ size_t iconv();
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
     AC_MSG_RESULT([
          $am_cv_proto_iconv])
-    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-      [Define as const if the declaration of iconv() needs const.])
-    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-    m4_ifdef([gl_ICONV_H_DEFAULTS],
-      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-      ])
+  else
+    dnl When compiling GNU libiconv on a system that does not have iconv yet,
+    dnl pick the POSIX compliant declaration without 'const'.
+    am_cv_proto_iconv_arg1=""
   fi
+  AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+    [Define as const if the declaration of iconv() needs const.])
+  dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+  m4_ifdef([gl_ICONV_H_DEFAULTS],
+    [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+     if test -n "$am_cv_proto_iconv_arg1"; then
+       ICONV_CONST="const"
+     fi
+    ])
 ])
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index c95ecc2..d4ac243 100644
--- a/m4/iconv_h.m4
+++ b/m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index 54e1dc8..2517a5b 100644
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/include_next.m4 b/m4/include_next.m4
index db0f2c0..068f6f6 100644
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -1,12 +1,13 @@
-# include_next.m4 serial 23
-dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
+# include_next.m4 serial 24
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert and Derek Price.
 
-dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER.
+dnl Sets INCLUDE_NEXT, INCLUDE_NEXT_AS_FIRST_DIRECTIVE, PRAGMA_SYSTEM_HEADER,
+dnl and PRAGMA_COLUMNS.
 dnl
 dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to
 dnl 'include' otherwise.
diff --git a/m4/inline.m4 b/m4/inline.m4
index 28fd2d0..f00572e 100644
--- a/m4/inline.m4
+++ b/m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index bba7b3d..aca924c 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 6209de6..8b8a26e 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,5 @@
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
+# lib-ld.m4 serial 7
+dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,73 +47,101 @@ if test "${PATH_SEPARATOR+set}" != set; then
        }
 fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
+if test -n "$LD"; then
+  AC_MSG_CHECKING([for ld])
+elif test "$GCC" = yes; then
   AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
 elif test "$with_gnu_ld" = yes; then
   AC_MSG_CHECKING([for GNU ld])
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL([acl_cv_path_LD],
-[if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  AC_CACHE_VAL([acl_cv_path_LD],
+  [
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [[\\/]]* | ?:[[\\/]]*)
+          re_direlt='/[[^/]][[^/]]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
       esac
     fi
-  done
-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_save_ifs"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_save_ifs"
+    fi
+    case $host in
+      *-*-aix*)
+        AC_EGREP_CPP([yes],
+          [#if defined __powerpc64__ || defined _ARCH_PPC64
+           yes
+           #endif
+          ],
+          [# The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          ], [])
+        ;;
+    esac
+  ])
+  LD="$acl_cv_path_LD"
+fi
 if test -n "$LD"; then
   AC_MSG_RESULT([$LD])
 else
   AC_MSG_RESULT([no])
+  AC_MSG_ERROR([no acceptable ld found in \$PATH])
 fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU
 ])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 2f51855..1ce9a5a 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 6851031..a5d56c8 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 8
+dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -174,51 +174,68 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
   dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
   dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
   AC_REQUIRE([AC_CANONICAL_HOST])
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
-      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-      dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-        [AC_EGREP_CPP([sixtyfour bits], [
+  dnl Allow the user to override the result by setting acl_cv_libdirstems.
+  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
+    [acl_cv_libdirstems],
+    [acl_libdirstem=lib
+     acl_libdirstem2=
+     case "$host_os" in
+       solaris*)
+         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+         dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+         dnl symlink is missing, so we set acl_libdirstem2 too.
+         AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+           [AC_EGREP_CPP([sixtyfour bits], [
 #ifdef _LP64
 sixtyfour bits
 #endif
-           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-        ])
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+              ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+           ])
+         if test $gl_cv_solaris_64bit = yes; then
+           acl_libdirstem=lib/64
+           case "$host_cpu" in
+             sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+             i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+           esac
+         fi
+         ;;
+       *)
+         dnl The result is a property of the system. However, non-system
+         dnl compilers sometimes have odd library search paths. Therefore
+         dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
+         searchpath=`(if test -f /usr/bin/gcc \
+                         && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
+                        LC_ALL=C /usr/bin/gcc -print-search-dirs; \
+                      else \
+                        LC_ALL=C $CC -print-search-dirs; \
+                      fi) 2>/dev/null \
+                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+         if test -n "$searchpath"; then
+           acl_save_IFS="${IFS= 	}"; IFS=":"
+           for searchdir in $searchpath; do
+             if test -d "$searchdir"; then
+               case "$searchdir" in
+                 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+                 */../ | */.. )
+                   # Better ignore directories of this form. They are misleading.
+                   ;;
+                 *) searchdir=`cd "$searchdir" && pwd`
+                    case "$searchdir" in
+                      */lib64 ) acl_libdirstem=lib64 ;;
+                    esac ;;
+               esac
+             fi
+           done
+           IFS="$acl_save_IFS"
+         fi
+         ;;
+     esac
+     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
+    ])
+  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
+  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
 ])
diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4
index f911216..ee648f2 100644
--- a/m4/libunistring-base.m4
+++ b/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4
new file mode 100644
index 0000000..443f91b
--- /dev/null
+++ b/m4/limits-h.m4
@@ -0,0 +1,31 @@
+dnl Check whether limits.h has needed features.
+
+dnl Copyright 2016-2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+AC_DEFUN_ONCE([gl_LIMITS_H],
+[
+  gl_CHECK_NEXT_HEADERS([limits.h])
+
+  AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.],
+    [gl_cv_header_limits_width],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+                           #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+                          #endif
+                          #include <limits.h>
+                          int ullw = ULLONG_WIDTH;]])],
+       [gl_cv_header_limits_width=yes],
+       [gl_cv_header_limits_width=no])])
+  if test "$gl_cv_header_limits_width" = yes; then
+    LIMITS_H=
+  else
+    LIMITS_H=limits.h
+  fi
+  AC_SUBST([LIMITS_H])
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+])
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index 22c311b..0c1ff38 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 92896a0..93d3da7 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index f222a08..c1d1154 100644
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4
index 2271f77..1459418 100644
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index 563f8f8..7426a65 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/localtime-buffer.m4 b/m4/localtime-buffer.m4
new file mode 100644
index 0000000..3965b5d
--- /dev/null
+++ b/m4/localtime-buffer.m4
@@ -0,0 +1,21 @@
+# localtime-buffer.m4 serial 1
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALTIME_BUFFER_DEFAULTS],
+[
+  NEED_LOCALTIME_BUFFER=0
+])
+
+dnl Macro invoked from other modules, to signal that the compilation of
+dnl module 'localtime-buffer' is needed.
+AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED],
+[
+  AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
+  NEED_LOCALTIME_BUFFER=1
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
+])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 36d8b12..9a3294b 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index e8c7eeb..536183f 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation,
+# mbrtowc.m4 serial 27  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,6 +40,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
       gl_MBRTOWC_EMPTY_INPUT
+      gl_MBRTOWC_C_LOCALE
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
@@ -76,6 +77,13 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define to 1 if the C locale may have encoding errors.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 ])
@@ -156,7 +164,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
         if (mbsinit (&state))
-          return 1;
+          return 2;
     }
   return 0;
 }]])],
@@ -216,7 +224,7 @@ int main ()
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, input + 3, 6, &state) != 4
           && mbtowc (&wc, input + 3, 6) == 4)
-        return 1;
+        return 2;
     }
   return 0;
 }]])],
@@ -344,7 +352,7 @@ int main ()
       mbrtowc (&wc, NULL, 5, &state);
       /* Check that wc was not modified.  */
       if (wc != (wchar_t) 0xBADFACE)
-        return 1;
+        return 2;
     }
   return 0;
 }]])],
@@ -531,7 +539,7 @@ int main ()
 
       memset (&state, '\0', sizeof (mbstate_t));
       if (mbrtowc (&wc, "", 1, &state) != 0)
-        return 1;
+        return 2;
     }
   return 0;
 }]])],
@@ -577,6 +585,46 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether mbrtowc reports encoding errors in the C locale.
+dnl Although POSIX was never intended to allow this, the GNU C Library
+dnl and other implementations do it.  See:
+dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+
+AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+[
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_C_locale_sans_EILSEQ],
+    [
+     dnl Initial guess, used when cross-compiling or when no suitable locale
+     dnl is present.
+     gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 2;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 3;
+              }
+            return 0;
+          ]])],
+      [gl_cv_C_locale_sans_EILSEQ=yes],
+      [gl_cv_C_locale_sans_EILSEQ=no],
+      [:])])
+])
+
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index 88f0836..5904a51 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,5 +1,5 @@
 # mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 3b5dc6e..79b8d76 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
 # mbsrtowcs.m4 serial 13
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index 0a8eae2..6325cf3 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,5 +1,5 @@
 # mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4
index e770bbf..378a4e2 100644
--- a/m4/mbtowc.m4
+++ b/m4/mbtowc.m4
@@ -1,5 +1,5 @@
 # mbtowc.m4 serial 2
-dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 25d32f0..b6ec814 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 853c89d..263687d 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index 43b5d05..30006cb 100644
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nls.m4 b/m4/nls.m4
index 93df8d3..afdb9ca 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,6 +1,6 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nocrash.m4 b/m4/nocrash.m4
index ecc55c6..2c2c5fb 100644
--- a/m4/nocrash.m4
+++ b/m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -110,11 +110,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
diff --git a/m4/off_t.m4 b/m4/off_t.m4
index 282751b..92c45ef 100644
--- a/m4/off_t.m4
+++ b/m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/po.m4 b/m4/po.m4
index d4bc262..c5a2f6b 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
 # po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 160d5f9..303bc31 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,16 +1,16 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
index 3e7b9e6..66ba9d4 100644
--- a/m4/ssize_t.m4
+++ b/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 625520f..d368123 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -1,11 +1,11 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-#serial 5
+#serial 7
 
 # Prepare for substituting <stdbool.h> if it is not supported.
 
@@ -43,56 +43,64 @@ AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
         [AC_LANG_PROGRAM(
            [[
              #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
+
+             #ifdef __cplusplus
+              typedef bool Bool;
+             #else
+              typedef _Bool Bool;
+              #ifndef bool
+               "error: bool is not defined"
+              #endif
+              #ifndef false
+               "error: false is not defined"
+              #endif
+              #if false
+               "error: false is not 0"
+              #endif
+              #ifndef true
+               "error: true is not defined"
+              #endif
+              #if true != 1
+               "error: true is not 1"
+              #endif
              #endif
+
              #ifndef __bool_true_false_are_defined
               "error: __bool_true_false_are_defined is not defined"
              #endif
 
-             struct s { _Bool s: 1; _Bool t; } s;
+             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
 
              char a[true == 1 ? 1 : -1];
              char b[false == 0 ? 1 : -1];
              char c[__bool_true_false_are_defined == 1 ? 1 : -1];
              char d[(bool) 0.5 == true ? 1 : -1];
              /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
+             char f[(Bool) 0.0 == false ? 1 : -1];
              char g[true];
-             char h[sizeof (_Bool)];
+             char h[sizeof (Bool)];
              char i[sizeof s.t];
              enum { j = false, k = true, l = false * true, m = true * 256 };
              /* The following fails for
                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
+             Bool n[m];
              char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
              /* Catch a bug in an HP-UX C compiler.  See
                 http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                 http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
               */
-             _Bool q = true;
-             _Bool *pq = &q;
+             Bool q = true;
+             Bool *pq = &q;
+             bool *qq = &q;
            ]],
            [[
              bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
+             *pq |= q; *pq |= ! q;
+             *qq |= q; *qq |= ! q;
              /* Refer to every declared value, to avoid compiler optimizations.  */
              return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
+                     + !m + !n + !o + !p + !q + !pq + !qq);
            ]])],
         [ac_cv_header_stdbool_h=yes],
         [ac_cv_header_stdbool_h=no])])
diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4
index c045c65..f45def1 100644
--- a/m4/stddef_h.m4
+++ b/m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 0f40ce8..4ac854d 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
+# stdint.m4 serial 50
+dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,9 @@ AC_DEFUN_ONCE([gl_STDINT_H],
 [
   AC_PREREQ([2.59])dnl
 
+  AC_REQUIRE([gl_LIMITS_H])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
   dnl Check for long long int and unsigned long long int.
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
   if test $ac_cv_type_long_long_int = yes; then
@@ -70,6 +73,8 @@ AC_DEFUN_ONCE([gl_STDINT_H],
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -150,6 +155,15 @@ uintptr_t h = UINTPTR_MAX;
 intmax_t i = INTMAX_MAX;
 uintmax_t j = UINTMAX_MAX;
 
+/* Check that SIZE_MAX has the correct type, if possible.  */
+#if 201112 <= __STDC_VERSION__
+int k = _Generic (SIZE_MAX, size_t: 0);
+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+       || (0x5110 <= __SUNPRO_C && !__STDC__))
+extern size_t k;
+extern __typeof__ (SIZE_MAX) k;
+#endif
+
 #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \
   ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
@@ -218,6 +232,8 @@ struct s {
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 ]
 gl_STDINT_INCLUDES
@@ -278,28 +294,74 @@ static const char *macro_values[] =
          ])
       ])
   fi
+
+  HAVE_C99_STDINT_H=0
+  HAVE_SYS_BITYPES_H=0
+  HAVE_SYS_INTTYPES_H=0
+  STDINT_H=stdint.h
   if test "$gl_cv_header_working_stdint_h" = yes; then
-    STDINT_H=
+    HAVE_C99_STDINT_H=1
+    dnl Now see whether the system <stdint.h> works without
+    dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+    AC_CACHE_CHECK([whether stdint.h predates C++11],
+      [gl_cv_header_stdint_predates_cxx11_h],
+      [gl_cv_header_stdint_predates_cxx11_h=yes
+       AC_COMPILE_IFELSE([
+         AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+         ]])],
+         [gl_cv_header_stdint_predates_cxx11_h=no])])
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+      AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+      AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+    fi
+    AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.],
+      [gl_cv_header_stdint_width],
+      [gl_cv_header_stdint_width=no
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[
+            /* Work if build is not clean.  */
+            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+            #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+             #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+            #endif
+            #include <stdint.h>
+            ]gl_STDINT_INCLUDES[
+            int iw = UINTMAX_WIDTH;
+            ]])],
+         [gl_cv_header_stdint_width=yes])])
+    if test "$gl_cv_header_stdint_width" = yes; then
+      STDINT_H=
+    fi
   else
     dnl Check for <sys/inttypes.h>, and for
     dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
     AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
     if test $ac_cv_header_sys_inttypes_h = yes; then
       HAVE_SYS_INTTYPES_H=1
-    else
-      HAVE_SYS_INTTYPES_H=0
     fi
-    AC_SUBST([HAVE_SYS_INTTYPES_H])
     if test $ac_cv_header_sys_bitypes_h = yes; then
       HAVE_SYS_BITYPES_H=1
-    else
-      HAVE_SYS_BITYPES_H=0
     fi
-    AC_SUBST([HAVE_SYS_BITYPES_H])
-
     gl_STDINT_TYPE_PROPERTIES
-    STDINT_H=stdint.h
   fi
+
+  dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
+  LIMITS_H=limits.h
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+
+  AC_SUBST([HAVE_C99_STDINT_H])
+  AC_SUBST([HAVE_SYS_BITYPES_H])
+  AC_SUBST([HAVE_SYS_INTTYPES_H])
   AC_SUBST([STDINT_H])
   AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
 ])
@@ -467,7 +529,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
   dnl requirement that wint_t is "unchanged by default argument promotions".
   dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
   dnl Set the variable BITSIZEOF_WINT_T accordingly.
-  if test $BITSIZEOF_WINT_T -lt 32; then
+  if test $GNULIB_OVERRIDES_WINT_T = 1; then
     BITSIZEOF_WINT_T=32
   fi
 ])
@@ -477,8 +539,3 @@ dnl Remove this when we can assume autoconf >= 2.61.
 m4_ifdef([AC_COMPUTE_INT], [], [
   AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
 ])
-
-# Hey Emacs!
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index 0e38758..9ffbb85 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,14 +1,18 @@
-# stdio_h.m4 serial 46
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+# stdio_h.m4 serial 48
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_STDIO_H],
 [
-  dnl For __USE_MINGW_ANSI_STDIO
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
+  AH_VERBATIM([MINGW_ANSI_STDIO],
+[/* Use GNU style printf and scanf.  */
+#ifndef __USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
+])
+  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_NEXT_HEADERS([stdio.h])
 
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 19107c4..110fe2d 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 43
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -21,7 +21,7 @@ AC_DEFUN([gl_STDLIB_H],
 #endif
     ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_openpt ptsname ptsname_r random random_r realpath rpmatch
+    posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch
     secure_getenv setenv setstate setstate_r srandom srandom_r
     strtod strtoll strtoull unlockpt unsetenv])
 ])
@@ -85,6 +85,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
   HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
+  HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
   HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
   HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 0c5ec6f..3d2ad22 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2016 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index b2a3646..9f7da64 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,5 +1,5 @@
-# strstr.m4 serial 16
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+# strstr.m4 serial 17
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -67,11 +67,17 @@ AC_DEFUN([gl_FUNC_STRSTR],
     AC_CACHE_CHECK([whether strstr works in linear time],
       [gl_cv_func_strstr_linear],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __MVS__
+/* z/OS does not deliver signals while strstr() is running (thanks to
+   restrictions on its LE runtime), which prevents us from limiting the
+   running time of this test.  */
+# error "This test does not work properly on z/OS"
+#endif
 #include <signal.h> /* for signal */
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
+static void quit (int sig) { _exit (sig + 128); }
 ]], [[
     int result = 0;
     size_t m = 1000000;
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index ae500c7..3ecbe7c 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 3d43b6f..8934278 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
-# sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
+# sys_stat_h.m4 serial 31   -*- Autoconf -*-
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,18 +19,21 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H],
   dnl Ensure the type mode_t gets defined.
   AC_REQUIRE([AC_TYPE_MODE_T])
 
-  dnl Whether to override 'struct stat'.
+  dnl Whether to enable precise timestamps in 'struct stat'.
+  m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [
+    AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC])
+  ], [
+    WINDOWS_STAT_TIMESPEC=0
+  ])
+  AC_SUBST([WINDOWS_STAT_TIMESPEC])
+
+  dnl Whether to ensure that struct stat.st_size is 64-bit wide.
   m4_ifdef([gl_LARGEFILE], [
     AC_REQUIRE([gl_LARGEFILE])
   ], [
     WINDOWS_64_BIT_ST_SIZE=0
   ])
   AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
-  if test $WINDOWS_64_BIT_ST_SIZE = 1; then
-    AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1],
-      [Define to 1 if Gnulib overrides 'struct stat' on Windows so that
-       struct stat.st_size becomes 64-bit.])
-  fi
 
   dnl Define types that are supposed to be defined in <sys/types.h> or
   dnl <sys/stat.h>.
@@ -72,6 +75,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS],
   GNULIB_MKNODAT=0;     AC_SUBST([GNULIB_MKNODAT])
   GNULIB_STAT=0;        AC_SUBST([GNULIB_STAT])
   GNULIB_UTIMENSAT=0;   AC_SUBST([GNULIB_UTIMENSAT])
+  GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
   HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 3061a9c..1c8c3cf 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
-# serial 8
+# serial 9
 
-# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -105,7 +105,6 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
   HAVE_GETTIMEOFDAY=1;       AC_SUBST([HAVE_GETTIMEOFDAY])
   HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
   HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
-  HAVE_TIMEZONE_T=0;         AC_SUBST([HAVE_TIMEZONE_T])
   REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])
   REPLACE_STRUCT_TIMEVAL=0;  AC_SUBST([REPLACE_STRUCT_TIMEVAL])
 ])
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index b0aabb4..e590670 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,5 +1,5 @@
-# sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# sys_types_h.m4 serial 7
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,8 +17,41 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H],
 
   dnl Whether to override the 'off_t' type.
   AC_REQUIRE([gl_TYPE_OFF_T])
+
+  dnl Whether to override the 'dev_t' and 'ino_t' types.
+  m4_ifdef([gl_WINDOWS_STAT_INODES], [
+    AC_REQUIRE([gl_WINDOWS_STAT_INODES])
+  ], [
+    WINDOWS_STAT_INODES=0
+  ])
+  AC_SUBST([WINDOWS_STAT_INODES])
 ])
 
 AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
 [
 ])
+
+# This works around a buggy version in autoconf <= 2.69.
+# See <https://lists.gnu.org/archive/html/autoconf/2016-08/msg00014.html>
+
+m4_version_prereq([2.70], [], [
+
+# This is taken from the following Autoconf patch:
+# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98
+
+m4_undefine([AC_HEADER_MAJOR])
+AC_DEFUN([AC_HEADER_MAJOR],
+[AC_CHECK_HEADERS_ONCE([sys/types.h])
+AC_CHECK_HEADER([sys/mkdev.h],
+  [AC_DEFINE([MAJOR_IN_MKDEV], [1],
+    [Define to 1 if `major', `minor', and `makedev' are declared in
+     <mkdev.h>.])])
+if test $ac_cv_header_sys_mkdev_h = no; then
+  AC_CHECK_HEADER([sys/sysmacros.h],
+    [AC_DEFINE([MAJOR_IN_SYSMACROS], [1],
+      [Define to 1 if `major', `minor', and `makedev' are declared in
+       <sysmacros.h>.])])
+fi
+])
+
+])
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index eb2a631..28e2209 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc.
 
-# serial 9
+# serial 11
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -104,24 +104,34 @@ AC_DEFUN([gl_TIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
 [
+  GNULIB_CTIME=0;                        AC_SUBST([GNULIB_CTIME])
   GNULIB_MKTIME=0;                       AC_SUBST([GNULIB_MKTIME])
+  GNULIB_LOCALTIME=0;                    AC_SUBST([GNULIB_LOCALTIME])
   GNULIB_NANOSLEEP=0;                    AC_SUBST([GNULIB_NANOSLEEP])
+  GNULIB_STRFTIME=0;                     AC_SUBST([GNULIB_STRFTIME])
   GNULIB_STRPTIME=0;                     AC_SUBST([GNULIB_STRPTIME])
   GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
   GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
   GNULIB_TIME_RZ=0;                      AC_SUBST([GNULIB_TIME_RZ])
+  GNULIB_TZSET=0;                        AC_SUBST([GNULIB_TZSET])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
   HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
   HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
   HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
+  HAVE_TZSET=1;                          AC_SUBST([HAVE_TZSET])
+  dnl Even GNU libc does not have timezone_t yet.
+  HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
   dnl If another module says to replace or to not replace, do that.
   dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
   dnl this lets maintainers check for portability.
+  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
   REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
   REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
+  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
   REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
+  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
 
   dnl Hack so that the time module doesn't depend on the sys_time module.
   dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 544dadb..cc44677 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 68
-dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
+# unistd_h.m4 serial 70
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -46,8 +46,8 @@ AC_DEFUN([gl_UNISTD_H],
     gethostname getlogin getlogin_r getpagesize
     getusershell setusershell endusershell
     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
-    unlink unlinkat usleep])
+    readlink readlinkat rmdir sethostname sleep symlink symlinkat
+    truncate ttyname_r unlink unlinkat usleep])
 ])
 
 AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -102,6 +102,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
   GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
   GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
+  GNULIB_TRUNCATE=0;             AC_SUBST([GNULIB_TRUNCATE])
   GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
   GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
   GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
@@ -139,12 +140,14 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
+  HAVE_TRUNCATE=1;        AC_SUBST([HAVE_TRUNCATE])
   HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
   HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
   HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
   HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
   HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
   HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
+  HAVE_DECL_GETLOGIN=1;   AC_SUBST([HAVE_DECL_GETLOGIN])
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
@@ -178,6 +181,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
   REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
   REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
+  REPLACE_TRUNCATE=0;     AC_SUBST([REPLACE_TRUNCATE])
   REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
   REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
   REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4
index 08440ec..25ce737 100644
--- a/m4/warn-on-use.m4
+++ b/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index b40b732..1a2734c 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -1,13 +1,13 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Written by Eric Blake.
 
-# wchar_h.m4 serial 39
+# wchar_h.m4 serial 42
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -35,6 +35,8 @@ AC_DEFUN([gl_WCHAR_H],
   fi
   AC_SUBST([HAVE_WINT_T])
 
+  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
+
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
@@ -53,7 +55,7 @@ AC_DEFUN([gl_WCHAR_H],
      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset
      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp
      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr
-     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth
+     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime
     ])
 ])
 
@@ -81,8 +83,14 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK],
 extern int zero (void);
 int main () { return zero(); }
 ]])])
+     dnl Do not rename the object file from conftest.$ac_objext to
+     dnl conftest1.$ac_objext, as this will cause the link to fail on
+     dnl z/OS when using the XPLINK object format (due to duplicate
+     dnl CSECT names). Instead, temporarily redefine $ac_compile so
+     dnl that the object file has the latter name from the start.
+     save_ac_compile="$ac_compile"
+     ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
      if AC_TRY_EVAL([ac_compile]); then
-       mv conftest.$ac_objext conftest1.$ac_objext
        AC_LANG_CONFTEST([
          AC_LANG_SOURCE([[#define wcstod renamed_wcstod
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -95,8 +103,9 @@ int main () { return zero(); }
 #include <wchar.h>
 int zero (void) { return 0; }
 ]])])
+       dnl See note above about renaming object files.
+       ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
        if AC_TRY_EVAL([ac_compile]); then
-         mv conftest.$ac_objext conftest2.$ac_objext
          if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
            :
          else
@@ -104,6 +113,7 @@ int zero (void) { return 0; }
          fi
        fi
      fi
+     ac_compile="$save_ac_compile"
      rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
     ])
   if test $gl_cv_header_wchar_h_correct_inline = no; then
@@ -169,6 +179,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
   GNULIB_WCSSTR=0;      AC_SUBST([GNULIB_WCSSTR])
   GNULIB_WCSTOK=0;      AC_SUBST([GNULIB_WCSTOK])
   GNULIB_WCSWIDTH=0;    AC_SUBST([GNULIB_WCSWIDTH])
+  GNULIB_WCSFTIME=0;    AC_SUBST([GNULIB_WCSFTIME])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
@@ -207,6 +218,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
   HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
   HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
   HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
+  HAVE_WCSFTIME=1;      AC_SUBST([HAVE_WCSFTIME])
   HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
   HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
   REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
@@ -222,4 +234,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
   REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
   REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
   REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
+  REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
 ])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index 2db8c3f..11783d2 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index 267b3c9..0aa040d 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,5 +1,5 @@
 # wcrtomb.m4 serial 11
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcsdup.m4 b/m4/wcsdup.m4
index caacb10..2a6d227 100644
--- a/m4/wcsdup.m4
+++ b/m4/wcsdup.m4
@@ -1,5 +1,5 @@
 # wcsdup.m4 serial 2
-dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctob.m4 b/m4/wctob.m4
index bdb5299..492f4c8 100644
--- a/m4/wctob.m4
+++ b/m4/wctob.m4
@@ -1,5 +1,5 @@
 # wctob.m4 serial 10
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctomb.m4 b/m4/wctomb.m4
index 7c8b3ef..dc1860f 100644
--- a/m4/wctomb.m4
+++ b/m4/wctomb.m4
@@ -1,5 +1,5 @@
 # wctomb.m4 serial 2
-dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index accc001..0c8c305 100644
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -1,8 +1,8 @@
-# wctype_h.m4 serial 18
+# wctype_h.m4 serial 20
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -30,6 +30,8 @@ AC_DEFUN([gl_WCTYPE_H],
   fi
   AC_SUBST([HAVE_WINT_T])
 
+  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
+
   gl_CHECK_NEXT_HEADERS([wctype.h])
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index 8ff2a5b..d30b8bc 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,11 +1,12 @@
-# wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
+# wint_t.m4 serial 7
+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
+dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 dnl Prerequisite: AC_PROG_CC
 
 AC_DEFUN([gt_TYPE_WINT_T],
@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T],
        [gt_cv_c_wint_t=no])])
   if test $gt_cv_c_wint_t = yes; then
     AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+
+    dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
+    dnl override 'wint_t'.
+    AC_CACHE_CHECK([whether wint_t is too small],
+      [gl_cv_type_wint_t_too_small],
+      [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([[
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+              ]])],
+           [gl_cv_type_wint_t_too_small=no],
+           [gl_cv_type_wint_t_too_small=yes])])
+    if test $gl_cv_type_wint_t_too_small = yes; then
+      GNULIB_OVERRIDES_WINT_T=1
+    else
+      GNULIB_OVERRIDES_WINT_T=0
+    fi
+  else
+    GNULIB_OVERRIDES_WINT_T=0
   fi
+  AC_SUBST([GNULIB_OVERRIDES_WINT_T])
+])
+
+dnl Prerequisites of the 'wint_t' override.
+AC_DEFUN([gl_TYPE_WINT_T_PREREQ],
+[
+  AC_CHECK_HEADERS_ONCE([crtdefs.h])
+  if test $ac_cv_header_crtdefs_h = yes; then
+    HAVE_CRTDEFS_H=1
+  else
+    HAVE_CRTDEFS_H=0
+  fi
+  AC_SUBST([HAVE_CRTDEFS_H])
 ])
diff --git a/m4/wmemcpy.m4 b/m4/wmemcpy.m4
index 7aca9e7..44dbfc5 100644
--- a/m4/wmemcpy.m4
+++ b/m4/wmemcpy.m4
@@ -1,5 +1,5 @@
 # wmemcpy.m4 serial 3
-dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/po/da.gmo b/po/da.gmo
index 51a3c926a25c7826e468fd4a2ab82bec8ee08678..15552f6625dc0792bb6a45a1c8410e338b340dfe 100644
GIT binary patch
delta 4947
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

delta 4998
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
MTYs3|*4LW<0f%37RR910

diff --git a/po/de.gmo b/po/de.gmo
index 8b01a558188c43f78bb99110abf7626cda881257..8405d1f90f333c52fe1382a45e3d391321c2d858 100644
GIT binary patch
delta 4964
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
Z&qACB^kpoFi@967onGCo-TFWM`Y)SmaIydZ

delta 5046
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
W?IVBC>J<0?KiVhl+juy7Gyet5UWv5;

diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 61c8e56212e0c814259ac3dd58f83113a83692c6..3db4354bd4fa706fa692e2f2c889a4837182b102 100644
GIT binary patch
delta 5049
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

delta 5101
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
SZ&oG5e}5V{70ZBL%zptmu$fQ*

diff --git a/po/en@quot.po b/po/en@quot.po
index 8e07d22..c64433a 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for trader package.
-# Copyright (C) 2016 John Zaitseff
+# Copyright (C) 2017 John Zaitseff
 # This file is distributed under the same license as the trader package.
-# Automatically generated, 2016.
+# Automatically generated, 2017.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 10:36+1100\n"
-"PO-Revision-Date: 2016-01-05 10:36+1100\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-20 12:28+1000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -39,24 +39,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -91,7 +108,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -451,10 +468,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1139,12 +1156,12 @@ msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1546,19 +1563,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1570,19 +1586,19 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1590,11 +1606,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1602,7 +1613,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1617,7 +1628,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1663,7 +1674,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1673,65 +1684,40 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognized option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn't allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognized option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognized option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"
diff --git a/po/en_AU.gmo b/po/en_AU.gmo
index d9402ee6d9815bcea5fe1168f4dc445f01df60e7..0c356969e4cdf0433c9f606180dfa4b36dc48947 100644
GIT binary patch
delta 5106
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

delta 5111
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

diff --git a/po/en_CA.gmo b/po/en_CA.gmo
index 637e6173c044f552cb6553fb888d2f887f48a786..dfbfffd22b0c633ea6466aeecb8773b46fdf2c97 100644
GIT binary patch
delta 5071
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
QCkDIBjcW6s(a~u98|8|Pj{pDw

delta 5116
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

diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index ed6f31ec303a8f74ccd0c5a1a3fcb0336e6a1495..c084f83cad441066027841e7963cb0670fd8cc50 100644
GIT binary patch
delta 5080
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

delta 5134
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
OUyhZ!y{Li<oBsixJ)-vj

diff --git a/po/en_US.gmo b/po/en_US.gmo
index 177cb663b4ede1c622169bc481eb2980720ccb02..129e4f0d043acebfa7ad09a1b5267583fe72774c 100644
GIT binary patch
delta 5115
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

delta 5103
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

diff --git a/po/eo.gmo b/po/eo.gmo
index 7f01d2b878c6451f46d6c833b372b2ab3f45edf9..d7da721f8c9637b24b2df67419fe3a239d9bc3f5 100644
GIT binary patch
delta 5024
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
XXsN2%)5hb3yEUG<VV;uy*F60fcHMq1

delta 5120
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

diff --git a/po/fi.gmo b/po/fi.gmo
index 193673d3db405071b195ea75e6e068d44ee5ad42..6c8de2f84073ee8f4e3ecf6e2ca679b94a4961a0 100644
GIT binary patch
delta 5056
zcmZ|SdvsLA0mt##@N^Tv5FiNxxgcu-Az>5V3j!f1qDg>&R8hbUEU@IUkZcm5;8Mgw
zdB|e{tqOurszpJGqA0aIl(t%xhuZcJIEB)4JhYZt5RQVU{r>h2YX9gx{_baH_CDs$
z%)P<mmp#kB^u*4#Z@$^Eog`hzu9n7RdW`AQMy<xIPc^0kZou}q8$01aycJK__H&p<
z{fe!(=3rgoHf)EztV6IP^|9F1n3$PPA&Z73ZiCs1I^k_h#t*E2L|yQ&n2ukfI(7?p
z<({S+ssny@dXUkm>jY69osXHg3`gR#xS0E!GZc2vFomn>#2YvUGwG%egV-EbU~gQ5
zci<bS<IkcxbRD~68pEUZ0oVh}F&pb``&Qfj7Ix+S<_rb(>^k0t9l4rLC_r84LDUE}
zpf0!tb^Jl>gQxB9Cc~I~>JIAsahQXR*bld3A%22-uvT0orVHm$=!~V<4Ch#@tn;i<
z>jLXy>r(4-Oyc~N$Y7Y&s43cEJz)I+)uF#+GX6a&bl~oE$_zoxSvl&-D{MW6Ot)Ew
zn(OCLPyQMf;5i(IX$;@pI3D$+Pof_1ed|Tkb-Y}>Eq3j~_z$AchlU|I6Z_*fyd6)Y
z7q6i@mc)|nh3!#8I1C-EK;7sud>nVG&Z6nn&6wp3=~(8CWoAC&q!c`l%$m6rqo76A
ziWPO50}JtU>Md#1lU~BX=*cx^C<ah(MFXls%TOb?(YnX_E@}$Spq}_L>H%9aY&G0x
zB&s8^eSKLhOxhu&v*rThsSY(`{Jx<*AL+d5HNco6EI|$V6PSmGQRn>=_13f*Xv_$_
zA2ouTF@OhAi}MOHTjq9#o$JNSa0=sSSc;6YIf1(17g&rbJpN94JRWtyD-1&!W(;#L
zG#hpNGSn38z%F<Mb)&P^udN;KbRVcMX6gMer=ZuQ7Infi*cA_;F8m4V!k1Aakv81@
zeIT-)%p_zM%{;sXx1bldqef^CcEmqhFJUtE77SAg_cy5&bi;0_1BY45t#ho8qSnMF
z)bYD*{ayR}XP8C%KddPu-FhEu2|C7@D(hN|sbMb#eOf<8-QbL^UqUUOZ&B~@txT9k
z$cI`yBdw*FPJIft!&>Zy%P{f&V<+kdZ2d!QOZ|Ki<F5;TNrQ$eWfUtE1E>oXStp=6
z7{r%7#zauBQ`gb%h!r5;6f*|(HUv=}T4aCUXn%hJ^*~3hpN@{XPy9IzT3p{?Vk+)(
zzvaWM(@-5+iW;Hys17}k`s4BnX5kUknmC8*;J2vrQu!+RusiDbF{s}kh*9WHp$hrW
zJi%@Seu{77RNg5KW#&CBR2+=Fk!CeE$9GV#<1yqFH(#NH-N(9rq(-40EQ~#IE#~8X
z)OoRU6x4yVd)*5RK=m|;I&lTwfqRfQ(40a&Y4UyU+mMSoz6^DI6g8DkVP8CsBk(Hr
z#(^d7eS%0wVrDG`z8&Te>coGeZs?S{i){=hQLnIutaGfD)*9=4Yt-6kU4&X2OHgZL
zOG4&<uWdMvettNM8me|>?g{--b6AS{uuQe}MX1HJ3biJ-Vh-*@P0^oFU&Q2b?gwrn
zs(mLq_?hJX<{AZEC}X_)TI8aJI)HraOdSSrAF5*)(TnXSxE<?^YVVDjigBnlQ;%BA
zn{XZO$DHQIj4C%K-prWF$&A0=&;LB=-nhdQcgSx?KkdV@J10c&I`s|H+$UW--I%+m
zKZmS0^EXVv{72l?Jrq-^m*8rghHLO5uEfTmdmmH5{PS5hw^cCz^ymR>N4?`LV<t1{
zKI}n#@f>$eJck1~?l|Vqexs7V3+StI|7<s)7U3T2$2f}mWgLzJtKE^R$71SFS2O-v
zd}nFUi5+VAha(O~M#(I}&UgZ~DF2QVv3-QU6Le%2YRHr7+&RucEv^NqDOr#D9=vWn
ziTY4|fts3Dv8a2353^~w6ZJZVP_N4h`}=;(qW-@1qSagPw)eK)i@NY!RL52#18MeR
zOMDdv;hVNS_AgtwY`tpz8ujEi@K#K3aOX4!RS#J2LoMEiQO8GYeU<%vD{3w5wH~&f
za*de_6w)~0D(XVsM%S*W6aCgv*oOKfY>gF|jFs3C8<DkY)?y3Xh+0ceVJmzAb=)hc
z^NuHeXZ}x7PzTQAEqE2x5wpPkS85t+=*FOqE3;OhI@Ew3>_qw!ZG0pXukd4dh@2!H
zh#qJeVfqu>F79t0BCipx<O-tgK5{?lPcq1FNFLGl64^*TQiW|jsU?X{<7V>zwukv)
zIr%XeN@7}#+D4L)3T%5^zT4}~SVMM_10<acB5#qWh(?E(A@R-l1>W2=ni_I#T7+8I
zyt&39e;_=3Eb)45p~9$}O7c3<Fl(FWlK6+`Pburwyn{?3@00078#9pjj;K6}Y*)c<
zC0ItDAn%ZT(w1o3rY`Ju%ZdHnwj8$V`~3jfN_vs`<U{fbSwV7%UN_cmVrycrMX0Tu
z=rgSCxJzRH@ej)5xPM|>$X>5i54UReS#R<rg`bcKBw`zb_y!q5>dAg`7y02<K;?Pz
z4Dpc>WGeX)Ng+4yZ{|_aC-Udy7%3&%X1SOT@J_Oq93+nreXz6@l4+!xEFpZG%n_n(
z23eITx!?X@Q%<(^9lHNmDvy%~$!el^^#u79SxhDoZ7-5n6D9Zm{cO?v))u;88(Ut7
zak7-?qm)H{N8Tg7iMGRJvY!84)!6!x=Mp7jeu<07(_|p2BHG?`F)!m>@&XxP+h$`6
zQf%vwT7Pf#Vhy>6^duX|Q9rw9$y#!An@M34X-(cHKO;FLK-x9Em)feiCp-RO$71%W
zo%*xCyHf@G7dy>XOL`af`RSSL?@8A&Ytq+v>f#$Ra+7>@@zEJhydon{#dk7%@rN>Z
zJK4UvY~!m7IQ2EPp&60cHQ_~}nNDP0G#shXk4;6LUrzNF^rUT;<16eLzmgkh`YQM7
zG*5QZ`Vq~OxW(q8Jde|Kw5XqFQnWTWGgNC9R9DnRBaJh-Y~uP08fVl-Bh?kER?WyZ
z-`C6TFEQh5BXdJDqIqLy=1mUO)^X#2<6g)alwaVF7Zn!|9+c-FkXPt;3JL>-gL4b~
ze!qA8xV-XELs-Y>jSfab0jJPk@ZE9#fPWyzH61G6-kJfJP})aNy|gsnrAz#DNe>lY
zExqQcYdTTZukF2&x?p8xC>#ws=a+7BLQ$t75_aYWqm@A?QWp(YhuJw*k$Lq|o+TWv
z>Fzj_BjKo1Ss#vuYAVAu-gyfbMvv_}wktkyYLC{=#Bfc0RaG#)WNNy%Iyh%$q^c^M
z=WW_Hbyc%u$EP9fn;6mj;FzYq!ELEY$DVBZsP=3Nj}w1s!G)IY5X9Fl%!(gc=xzJI
GWA<OPyNrqe

delta 5121
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

diff --git a/po/fr.gmo b/po/fr.gmo
index fa4aa74ed1609175d3cd6462ad64bd240e11c689..e3eee64557e74551a80d5db8fbe1ca3d5fa5650a 100644
GIT binary patch
delta 4948
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
H-p79c1ZZmw

delta 5010
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

diff --git a/po/hr.gmo b/po/hr.gmo
index b07e81ce58e91bc3886e714e29b2614ebb51aed6..20bd12562d10535d1d3af4a8523bd3a628daa88c 100644
GIT binary patch
delta 5078
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
MdAzi|<$q@KzjM5sTL1t6

delta 5143
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
G#{U5bp|pGe

diff --git a/po/hu.gmo b/po/hu.gmo
index 03416c38f112e2046bfec0ee0f3550b733a16c13..90ff51dcb85d77b1ac7f8644e2f6f4eb2c17be5b 100644
GIT binary patch
delta 4959
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
aJP307=B-?s5Pf6Wb{^=)vTgtKNdEyiYHk<+

delta 5031
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
b7S=b12O=A91v;%rO8Ea<;(FW^r#Alu>1c!*

diff --git a/po/nb.gmo b/po/nb.gmo
index 7e1c1c14fe484cfc88c69eb28934ebea5531b53c..52ffb78a9fe32c6093722fc3201d68f59f42e482 100644
GIT binary patch
delta 4947
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

delta 5036
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
IRCmJs59y<U$N&HU

diff --git a/po/ru.gmo b/po/ru.gmo
index 668a440bcbacc46a6eddc3cb748a1a7fffb16c20..7275510ab87f900e27f24faf4c59aaa2eb33c81c 100644
GIT binary patch
delta 5067
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

delta 5081
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

diff --git a/po/sv.gmo b/po/sv.gmo
index ca60f0bc910dd7fc83b77d7eb97c421fa37ca90a..c574ba6bf2c432a4d7b97788e302d61b0a3042be 100644
GIT binary patch
delta 4953
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
LD!AqUUd(?0O%`Ww

delta 5044
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

diff --git a/po/trader.pot b/po/trader.pot
index b4b93a8..1a28185 100644
--- a/po/trader.pot
+++ b/po/trader.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.9\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2016-01-05 10:52+1100\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\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"
@@ -18,24 +18,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr ""
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr ""
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr ""
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr ""
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr ""
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr ""
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr ""
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr ""
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -59,7 +76,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr ""
 
 #: src/trader.c:311
@@ -404,7 +421,7 @@ msgstr ""
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
 
@@ -1056,12 +1073,12 @@ msgstr ""
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr ""
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr ""
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1361,19 +1378,18 @@ msgstr ""
 msgid "  How to Play  "
 msgstr ""
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
+msgid "Page %1$d of %2$d"
 msgstr ""
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr ""
@@ -1385,19 +1401,19 @@ msgstr ""
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr ""
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr ""
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr ""
 
 #: src/intf.c:434
@@ -1405,11 +1421,6 @@ msgstr ""
 msgid "terminal size is too small (%d x %d required)"
 msgstr ""
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr ""
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1417,7 +1428,7 @@ msgstr ""
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr ""
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1432,7 +1443,7 @@ msgstr ""
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr ""
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1478,7 +1489,7 @@ msgstr ""
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr ""
 
 #: src/utils.c:1081
@@ -1488,65 +1499,40 @@ msgstr ""
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr ""
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr ""
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
 msgstr ""
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr ""
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr ""
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr ""
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr ""
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index 9851516..8ec3f2b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,12 +17,12 @@
 #########################################################################
 #                                                                       #
 #             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2016, John Zaitseff                 #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
 #                                                                       #
 #########################################################################
 
 # Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id: Makefile.am 663 2016-01-04 22:25:51Z john $
+# $Id: c5121ca6902e89b7792d99bccdfa04dff14a7c5f $
 #
 # This file, src/Makefile.am, contains the source-code Makefile for Star
 # Traders.  It needs to be processed by automake to produce the
@@ -125,32 +125,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \
-	$(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
+	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
 	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
-	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gnulib-comp.m4 \
+	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
-	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
-	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/nocrash.m4 \
-	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ssize_t.m4 \
-	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
-	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
+	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
+	$(top_srcdir)/m4/localtime-buffer.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -257,7 +261,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -266,6 +271,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
@@ -278,6 +284,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_CTIME = @GNULIB_CTIME@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
@@ -344,6 +351,7 @@ GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -385,6 +393,8 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@
+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
 GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
@@ -433,6 +443,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
 GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
+GNULIB_STRFTIME = @GNULIB_STRFTIME@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -454,7 +465,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@
 GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
+GNULIB_TZSET = @GNULIB_TZSET@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
@@ -484,6 +497,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
 GNULIB_WCSCPY = @GNULIB_WCSCPY@
 GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
 GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@
 GNULIB_WCSLEN = @GNULIB_WCSLEN@
 GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
 GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
@@ -514,8 +528,10 @@ GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
@@ -526,6 +542,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
@@ -615,6 +632,7 @@ HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_QSORT_R = @HAVE_QSORT_R@
 HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
@@ -648,6 +666,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
@@ -655,6 +674,8 @@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
+HAVE_TRUNCATE = @HAVE_TRUNCATE@
+HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
@@ -676,6 +697,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@
 HAVE_WCSCPY = @HAVE_WCSCPY@
 HAVE_WCSCSPN = @HAVE_WCSCSPN@
 HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSFTIME = @HAVE_WCSFTIME@
 HAVE_WCSLEN = @HAVE_WCSLEN@
 HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
 HAVE_WCSNCAT = @HAVE_WCSNCAT@
@@ -724,6 +746,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
 LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIMITS_H = @LIMITS_H@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
@@ -732,6 +755,7 @@ LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
@@ -739,6 +763,7 @@ MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -754,6 +779,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_LIMITS_H = @NEXT_LIMITS_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -776,6 +802,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -787,6 +816,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_CTIME = @REPLACE_CTIME@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
@@ -882,6 +912,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
+REPLACE_STRFTIME = @REPLACE_STRFTIME@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
@@ -896,7 +927,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_TZSET = @REPLACE_TZSET@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
@@ -909,6 +942,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
@@ -936,6 +970,8 @@ VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -944,7 +980,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -960,6 +995,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+desktopdir = @desktopdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -974,6 +1010,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+iconsdir = @iconsdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -1011,15 +1048,15 @@ trader_SOURCES = \
 			system.h
 
 trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib	\
-		  -DLOCALEDIR=\"$(localedir)\"
+		  @CURSES_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
 
-trader_LDADD = @CURSES_LIB@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
+trader_LDADD = @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@
 EXTRA_DIST = README
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1043,9 +1080,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)

From 19c6c862006e4004e88fb7c0823b3f5eb1201583 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 14:18:00 +1000
Subject: [PATCH 57/99] Remove files no longer generated by Gnulib

---
 build-aux/ar-lib                     | 270 --------------------------
 build-aux/snippet/_Noreturn.h        |  10 -
 build-aux/snippet/arg-nonnull.h      |  26 ---
 build-aux/snippet/c++defs.h          | 271 ---------------------------
 build-aux/snippet/unused-parameter.h |  36 ----
 build-aux/snippet/warn-on-use.h      | 109 -----------
 6 files changed, 722 deletions(-)
 delete mode 100755 build-aux/ar-lib
 delete mode 100644 build-aux/snippet/_Noreturn.h
 delete mode 100644 build-aux/snippet/arg-nonnull.h
 delete mode 100644 build-aux/snippet/c++defs.h
 delete mode 100644 build-aux/snippet/unused-parameter.h
 delete mode 100644 build-aux/snippet/warn-on-use.h

diff --git a/build-aux/ar-lib b/build-aux/ar-lib
deleted file mode 100755
index 463b9ec..0000000
--- a/build-aux/ar-lib
+++ /dev/null
@@ -1,270 +0,0 @@
-#! /bin/sh
-# Wrapper for Microsoft lib.exe
-
-me=ar-lib
-scriptversion=2012-03-01.08; # UTC
-
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
-# Written by Peter Rosin <peda@lysator.liu.se>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-
-# func_error message
-func_error ()
-{
-  echo "$me: $1" 1>&2
-  exit 1
-}
-
-file_conv=
-
-# func_file_conv build_file
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv in
-	mingw)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_at_file at_file operation archive
-# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
-# for each of them.
-# When interpreting the content of the @FILE, do NOT use func_file_conv,
-# since the user would need to supply preconverted file names to
-# binutils ar, at least for MinGW.
-func_at_file ()
-{
-  operation=$2
-  archive=$3
-  at_file_contents=`cat "$1"`
-  eval set x "$at_file_contents"
-  shift
-
-  for member
-  do
-    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
-  done
-}
-
-case $1 in
-  '')
-     func_error "no command.  Try '$0 --help' for more information."
-     ;;
-  -h | --h*)
-    cat <<EOF
-Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
-
-Members may be specified in a file named with @FILE.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "$me, version $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test $# -lt 3; then
-  func_error "you must specify a program, an action and an archive"
-fi
-
-AR=$1
-shift
-while :
-do
-  if test $# -lt 2; then
-    func_error "you must specify a program, an action and an archive"
-  fi
-  case $1 in
-    -lib | -LIB \
-    | -ltcg | -LTCG \
-    | -machine* | -MACHINE* \
-    | -subsystem* | -SUBSYSTEM* \
-    | -verbose | -VERBOSE \
-    | -wx* | -WX* )
-      AR="$AR $1"
-      shift
-      ;;
-    *)
-      action=$1
-      shift
-      break
-      ;;
-  esac
-done
-orig_archive=$1
-shift
-func_file_conv "$orig_archive"
-archive=$file
-
-# strip leading dash in $action
-action=${action#-}
-
-delete=
-extract=
-list=
-quick=
-replace=
-index=
-create=
-
-while test -n "$action"
-do
-  case $action in
-    d*) delete=yes  ;;
-    x*) extract=yes ;;
-    t*) list=yes    ;;
-    q*) quick=yes   ;;
-    r*) replace=yes ;;
-    s*) index=yes   ;;
-    S*)             ;; # the index is always updated implicitly
-    c*) create=yes  ;;
-    u*)             ;; # TODO: don't ignore the update modifier
-    v*)             ;; # TODO: don't ignore the verbose modifier
-    *)
-      func_error "unknown action specified"
-      ;;
-  esac
-  action=${action#?}
-done
-
-case $delete$extract$list$quick$replace,$index in
-  yes,* | ,yes)
-    ;;
-  yesyes*)
-    func_error "more than one action specified"
-    ;;
-  *)
-    func_error "no action specified"
-    ;;
-esac
-
-if test -n "$delete"; then
-  if test ! -f "$orig_archive"; then
-    func_error "archive not found"
-  fi
-  for member
-  do
-    case $1 in
-      @*)
-        func_at_file "${1#@}" -REMOVE "$archive"
-        ;;
-      *)
-        func_file_conv "$1"
-        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
-        ;;
-    esac
-  done
-
-elif test -n "$extract"; then
-  if test ! -f "$orig_archive"; then
-    func_error "archive not found"
-  fi
-  if test $# -gt 0; then
-    for member
-    do
-      case $1 in
-        @*)
-          func_at_file "${1#@}" -EXTRACT "$archive"
-          ;;
-        *)
-          func_file_conv "$1"
-          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
-          ;;
-      esac
-    done
-  else
-    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
-    do
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
-    done
-  fi
-
-elif test -n "$quick$replace"; then
-  if test ! -f "$orig_archive"; then
-    if test -z "$create"; then
-      echo "$me: creating $orig_archive"
-    fi
-    orig_archive=
-  else
-    orig_archive=$archive
-  fi
-
-  for member
-  do
-    case $1 in
-    @*)
-      func_file_conv "${1#@}"
-      set x "$@" "@$file"
-      ;;
-    *)
-      func_file_conv "$1"
-      set x "$@" "$file"
-      ;;
-    esac
-    shift
-    shift
-  done
-
-  if test -n "$orig_archive"; then
-    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
-  else
-    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
-  fi
-
-elif test -n "$list"; then
-  if test ! -f "$orig_archive"; then
-    func_error "archive not found"
-  fi
-  $AR -NOLOGO -LIST "$archive" || exit $?
-fi
diff --git a/build-aux/snippet/_Noreturn.h b/build-aux/snippet/_Noreturn.h
deleted file mode 100644
index c44ad89..0000000
--- a/build-aux/snippet/_Noreturn.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#if !defined _Noreturn && __STDC_VERSION__ < 201112
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
deleted file mode 100644
index 584649f..0000000
--- a/build-aux/snippet/arg-nonnull.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2016 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-   that the values passed as arguments n, ..., m must be non-NULL pointers.
-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-#ifndef _GL_ARG_NONNULL
-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-# else
-#  define _GL_ARG_NONNULL(params)
-# endif
-#endif
diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
deleted file mode 100644
index 813f2e2..0000000
--- a/build-aux/snippet/c++defs.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* C++ compatible function declaration macros.
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GL_CXXDEFS_H
-#define _GL_CXXDEFS_H
-
-/* The three most frequent use cases of these macros are:
-
-   * For providing a substitute for a function that is missing on some
-     platforms, but is declared and works fine on the platforms on which
-     it exists:
-
-       #if @GNULIB_FOO@
-       # if !@HAVE_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       # endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on all platforms,
-     but is broken/insufficient and needs to be replaced on some platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on some platforms
-     but is broken/insufficient and needs to be replaced on some of them and
-     is additionally either missing or undeclared on some other platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       #  endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-*/
-
-/* _GL_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#if defined __cplusplus
-# define _GL_EXTERN_C extern "C"
-#else
-# define _GL_EXTERN_C extern
-#endif
-
-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
-   declares a replacement function, named rpl_func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
-  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
-
-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
-   declares the system function, named func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype func parameters_and_attributes
-
-/* _GL_CXXALIAS_RPL (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
-   Example:
-     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
- */
-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
-  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                \
-    {                                                         \
-      rettype (*const func) parameters = ::rpl_func;          \
-    }                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
-   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
-   except that the C function rpl_func may have a slightly different
-   declaration.  A cast is used to silence the "invalid conversion" error
-   that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                     \
-    {                                                              \
-      rettype (*const func) parameters =                           \
-        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
-    }                                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to the system provided function func, if GNULIB_NAMESPACE
-   is defined.
-   Example:
-     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
- */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* If we were to write
-       rettype (*const func) parameters = ::func;
-     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
-     better (remove an indirection through a 'static' pointer variable),
-     but then the _GL_CXXALIASWARN macro below would cause a warning not only
-     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                     \
-    {                                              \
-      static rettype (*func) parameters = ::func;  \
-    }                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function func may have a slightly different declaration.
-   A cast is used to silence the "invalid conversion" error that would
-   otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                          \
-    {                                                   \
-      static rettype (*func) parameters =               \
-        reinterpret_cast<rettype(*)parameters>(::func); \
-    }                                                   \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function is picked among a set of overloaded functions,
-   namely the one with rettype2 and parameters2.  Two consecutive casts
-   are used to silence the "cannot find a match" and "invalid conversion"
-   errors that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* The outer cast must be a reinterpret_cast.
-     The inner cast: When the function is defined as a set of overloaded
-     functions, it works as a static_cast<>, choosing the designated variant.
-     When the function is defined as a single variant, it works as a
-     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    namespace GNULIB_NAMESPACE                                                \
-    {                                                                         \
-      static rettype (*func) parameters =                                     \
-        reinterpret_cast<rettype(*)parameters>(                               \
-          (rettype2(*)parameters2)(::func));                                  \
-    }                                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN (func);
-   causes a warning to be emitted when ::func is used but not when
-   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
-   variants.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN(func) \
-   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN_1(func,namespace) \
-   _GL_CXXALIASWARN_2 (func, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-    _GL_WARN_ON_USE (func, \
-                     "The symbol ::" #func " refers to the system function. " \
-                     "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN(func) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
-   causes a warning to be emitted when the given overloaded variant of ::func
-   is used but not when GNULIB_NAMESPACE::func is used.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
-                        GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
-   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
-                         "The symbol ::" #func " refers to the system function. " \
-                         "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-#endif /* _GL_CXXDEFS_H */
diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h
deleted file mode 100644
index 843db76..0000000
--- a/build-aux/snippet/unused-parameter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter
-   declarations for parameters that are not used.  This helps to reduce
-   warnings, such as from GCC -Wunused-parameter.  The syntax is as follows:
-       type param _GL_UNUSED_PARAMETER
-   or more generally
-       param_decl _GL_UNUSED_PARAMETER
-   For example:
-       int param _GL_UNUSED_PARAMETER
-       int *(*param)(void) _GL_UNUSED_PARAMETER
-   Other possible, but obscure and discouraged syntaxes:
-       int _GL_UNUSED_PARAMETER *(*param)(void)
-       _GL_UNUSED_PARAMETER int *(*param)(void)
- */
-#ifndef _GL_UNUSED_PARAMETER
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED_PARAMETER __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED_PARAMETER
-# endif
-#endif
diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
deleted file mode 100644
index 2948b47..0000000
--- a/build-aux/snippet/warn-on-use.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
-   for FUNCTION which will then trigger a compiler warning containing
-   the text of "literal string" anywhere that function is called, if
-   supported by the compiler.  If the compiler does not support this
-   feature, the macro expands to an unused extern declaration.
-
-   This macro is useful for marking a function as a potential
-   portability trap, with the intent that "literal string" include
-   instructions on the replacement function that should be used
-   instead.  However, one of the reasons that a function is a
-   portability trap is if it has the wrong signature.  Declaring
-   FUNCTION with a different signature in C is a compilation error, so
-   this macro must use the same type as any existing declaration so
-   that programs that avoid the problematic FUNCTION do not fail to
-   compile merely because they included a header that poisoned the
-   function.  But this implies that _GL_WARN_ON_USE is only safe to
-   use if FUNCTION is known to already have a declaration.  Use of
-   this macro implies that there must not be any other macro hiding
-   the declaration of FUNCTION; but undefining FUNCTION first is part
-   of the poisoning process anyway (although for symbols that are
-   provided only via a macro, the result is a compilation error rather
-   than a warning containing "literal string").  Also note that in
-   C++, it is only safe to use if FUNCTION has no overloads.
-
-   For an example, it is possible to poison 'getline' by:
-   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
-     [getline]) in configure.ac, which potentially defines
-     HAVE_RAW_DECL_GETLINE
-   - adding this code to a header that wraps the system <stdio.h>:
-     #undef getline
-     #if HAVE_RAW_DECL_GETLINE
-     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
-       "not universally present; use the gnulib module getline");
-     #endif
-
-   It is not possible to directly poison global variables.  But it is
-   possible to write a wrapper accessor function, and poison that
-   (less common usage, like &environ, will cause a compilation error
-   rather than issue the nice warning, but the end result of informing
-   the developer about their portability problem is still achieved):
-   #if HAVE_RAW_DECL_ENVIRON
-   static char ***rpl_environ (void) { return &environ; }
-   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
-   # undef environ
-   # define environ (*rpl_environ ())
-   #endif
-   */
-#ifndef _GL_WARN_ON_USE
-
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE(function, message) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
-   is like _GL_WARN_ON_USE (function, "string"), except that the function is
-   declared with the given prototype, consisting of return type, parameters,
-   and attributes.
-   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
-   not work in this case.  */
-#ifndef _GL_WARN_ON_USE_CXX
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes \
-     __attribute__ ((__warning__ (msg)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#ifndef _GL_WARN_EXTERN_C
-# if defined __cplusplus
-#  define _GL_WARN_EXTERN_C extern "C"
-# else
-#  define _GL_WARN_EXTERN_C extern
-# endif
-#endif

From b6d311cf80201cf5c3bd15c8c48bf32f680d91c6 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 14:26:53 +1000
Subject: [PATCH 58/99] Include generated files accidentally ignored in this
 branch

---
 .gitignore          |   3 ---
 data/trader.desktop |  64 ++++++++++++++++++++++++++++++++++++++++++++
 po/sr.gmo           | Bin 0 -> 37555 bytes
 3 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 data/trader.desktop
 create mode 100644 po/sr.gmo

diff --git a/.gitignore b/.gitignore
index bc2182b..bbd4245 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.o
 *.a
-*.gmo
 Makefile
 TAGS
 .deps/
@@ -11,8 +10,6 @@ TAGS
 /config.status
 /stamp-h1
 
-/data/trader.desktop
-
 /po/Makefile.in
 /po/POTFILES
 /po/en@quot.insert-header
diff --git a/data/trader.desktop b/data/trader.desktop
new file mode 100644
index 0000000..a46dba3
--- /dev/null
+++ b/data/trader.desktop
@@ -0,0 +1,64 @@
+[Desktop Entry]
+Name[en@quot]=Star Traders
+Name[en_AU]=Star Traders
+Name[en_CA]=Star Traders
+Name[en_GB]=Star Traders
+Name[en_US]=Star Traders
+Name[da]=Star Traders
+Name[de]=Star Traders
+Name[eo]=Star Traders
+Name[fi]=Tähtikauppiaat
+Name[fr]=Star Traders
+Name[hr]=Star Traders
+Name[hu]=Star Traders
+Name[nb]=Star Traders
+Name[ru]=Звёздные торговцы
+Name[sr]=Звездани трговци
+Name[sv]=Star Traders
+Name=Star Traders
+Comment[en@quot]=Play Star Traders, a simple game of interstellar trading
+Comment[en_AU]=Play Star Traders, a simple game of interstellar trading
+Comment[en_CA]=Play Star Traders, a simple game of interstellar trading
+Comment[en_GB]=Play Star Traders, a simple game of interstellar trading
+Comment[en_US]=Play Star Traders, a simple game of interstellar trading
+Comment[da]=Spil Star Traders, et simpelt spil med rumhandel
+Comment[de]=Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel
+Comment[eo]=Ludi Star Traders, simpla ludo pri interstelara komerco
+Comment[fi]=Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä
+Comment[fr]=Jouer à Star Traders, un simple jeu de commerce interstellaire
+Comment[hr]=Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja
+Comment[hu]=A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása
+Comment[nb]=Spill Star Traders, et enkelt spill med interstellar handel
+Comment[ru]=Играть в «Звёздные торговцы», простую игру о межзвёздной торговле
+Comment[sr]=Играјте Звездане трговце, једноставну игру међузвезданог трговања
+Comment[sv]=Spela Star Traders, ett enkelt spel om interstellär handel
+Comment=Play Star Traders, a simple game of interstellar trading
+Keywords[en@quot]=game;interstellar;trading;strategy;
+Keywords[en_AU]=game;interstellar;trading;strategy;
+Keywords[en_CA]=game;interstellar;trading;strategy;
+Keywords[en_GB]=game;interstellar;trading;strategy;
+Keywords[en_US]=game;interstellar;trading;strategy;
+Keywords[ru]=игра;межзвёздная;торговля;стратегия;
+Keywords=game;interstellar;trading;strategy;
+Icon[en@quot]=trader
+Icon[en_AU]=trader
+Icon[en_CA]=trader
+Icon[en_GB]=trader
+Icon[en_US]=trader
+Icon[da]=trader
+Icon[de]=trader
+Icon[eo]=trader
+Icon[fi]=trader
+Icon[fr]=trader
+Icon[hr]=trader
+Icon[hu]=trader
+Icon[nb]=trader
+Icon[ru]=trader
+Icon[sr]=trader
+Icon[sv]=trader
+Icon=trader
+Exec=trader
+TryExec=trader
+Type=Application
+Terminal=true
+Categories=Game;StrategyGame;
diff --git a/po/sr.gmo b/po/sr.gmo
new file mode 100644
index 0000000000000000000000000000000000000000..b395541a24c1d3c9ecdc2375d2628873845c5a0e
GIT binary patch
literal 37555
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

literal 0
HcmV?d00001


From e62e7fffdab4004ec1daa1f0d4ca6db2865c7cb1 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sat, 20 May 2017 14:32:20 +1000
Subject: [PATCH 59/99] Include library files accidentally ignored in this
 branch

---
 lib/.gitignore         |   4 -
 lib/arg-nonnull.h      |  26 ++++
 lib/c++defs.h          | 316 +++++++++++++++++++++++++++++++++++++++++
 lib/unused-parameter.h |  36 +++++
 lib/warn-on-use.h      | 109 ++++++++++++++
 5 files changed, 487 insertions(+), 4 deletions(-)
 create mode 100644 lib/arg-nonnull.h
 create mode 100644 lib/c++defs.h
 create mode 100644 lib/unused-parameter.h
 create mode 100644 lib/warn-on-use.h

diff --git a/lib/.gitignore b/lib/.gitignore
index 342a12a..fea09a8 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,5 +1,3 @@
-/arg-nonnull.h
-/c++defs.h
 /charset.alias
 /configmake.h
 /getopt.h
@@ -22,8 +20,6 @@
 /unistd.h
 /unistr.h
 /unitypes.h
-/unused-parameter.h
-/warn-on-use.h
 /wchar.h
 /wctype.h
 
diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h
new file mode 100644
index 0000000..1e62cc8
--- /dev/null
+++ b/lib/arg-nonnull.h
@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
diff --git a/lib/c++defs.h b/lib/c++defs.h
new file mode 100644
index 0000000..f03f359
--- /dev/null
+++ b/lib/c++defs.h
@@ -0,0 +1,316 @@
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* Begin/end the GNULIB_NAMESPACE namespace.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE {
+# define _GL_END_NAMESPACE }
+#else
+# define _GL_BEGIN_NAMESPACE
+# define _GL_END_NAMESPACE
+#endif
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+
+   Wrapping rpl_func in an object with an inline conversion operator
+   avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::rpl_func;                                  \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      static const struct _gl_ ## func ## _wrapper                 \
+      {                                                            \
+        typedef rettype (*type) parameters;                        \
+                                                                   \
+        inline operator type () const                              \
+        {                                                          \
+          return reinterpret_cast<type>(::rpl_func);               \
+        }                                                          \
+      } func = {};                                                 \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+
+   Wrapping func in an object with an inline conversion operator
+   avoids a reference to func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS(func,rettype,parameters)            \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::func;                                      \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static const struct _gl_ ## func ## _wrapper      \
+      {                                                 \
+        typedef rettype (*type) parameters;             \
+                                                        \
+        inline operator type () const                   \
+        {                                               \
+          return reinterpret_cast<type>(::func);        \
+        }                                               \
+      } func = {};                                      \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static const struct _gl_ ## func ## _wrapper                            \
+      {                                                                       \
+        typedef rettype (*type) parameters;                                   \
+                                                                              \
+        inline operator type () const                                         \
+        {                                                                     \
+          return reinterpret_cast<type>((rettype2 (*) parameters2)(::func));  \
+        }                                                                     \
+      } func = {};                                                            \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
diff --git a/lib/unused-parameter.h b/lib/unused-parameter.h
new file mode 100644
index 0000000..b300055
--- /dev/null
+++ b/lib/unused-parameter.h
@@ -0,0 +1,36 @@
+/* A C macro for declaring that specific function parameters are not used.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter
+   declarations for parameters that are not used.  This helps to reduce
+   warnings, such as from GCC -Wunused-parameter.  The syntax is as follows:
+       type param _GL_UNUSED_PARAMETER
+   or more generally
+       param_decl _GL_UNUSED_PARAMETER
+   For example:
+       int param _GL_UNUSED_PARAMETER
+       int *(*param)(void) _GL_UNUSED_PARAMETER
+   Other possible, but obscure and discouraged syntaxes:
+       int _GL_UNUSED_PARAMETER *(*param)(void)
+       _GL_UNUSED_PARAMETER int *(*param)(void)
+ */
+#ifndef _GL_UNUSED_PARAMETER
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+#  define _GL_UNUSED_PARAMETER __attribute__ ((__unused__))
+# else
+#  define _GL_UNUSED_PARAMETER
+# endif
+#endif
diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h
new file mode 100644
index 0000000..3c0eb57
--- /dev/null
+++ b/lib/warn-on-use.h
@@ -0,0 +1,109 @@
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   This macro is useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.  However, one of the reasons that a function is a
+   portability trap is if it has the wrong signature.  Declaring
+   FUNCTION with a different signature in C is a compilation error, so
+   this macro must use the same type as any existing declaration so
+   that programs that avoid the problematic FUNCTION do not fail to
+   compile merely because they included a header that poisoned the
+   function.  But this implies that _GL_WARN_ON_USE is only safe to
+   use if FUNCTION is known to already have a declaration.  Use of
+   this macro implies that there must not be any other macro hiding
+   the declaration of FUNCTION; but undefining FUNCTION first is part
+   of the poisoning process anyway (although for symbols that are
+   provided only via a macro, the result is a compilation error rather
+   than a warning containing "literal string").  Also note that in
+   C++, it is only safe to use if FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+   #if HAVE_RAW_DECL_ENVIRON
+   static char ***rpl_environ (void) { return &environ; }
+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+   # undef environ
+   # define environ (*rpl_environ ())
+   #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif

From 44de2f98545713540948304ca8dde220f0d23857 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Sun, 21 May 2017 21:51:16 +1000
Subject: [PATCH 60/99] Update da.po to the latest version from the Translation
 Project

---
 po/da.po | 140 +++++++++++++++++++++++++------------------------------
 1 file changed, 63 insertions(+), 77 deletions(-)

diff --git a/po/da.po b/po/da.po
index a59240a..e98b3d7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,41 +8,58 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Joe Hansen <joedalton2@yahoo.dk>, 2012-15.
+#   Joe Hansen <joedalton2@yahoo.dk>, 2012-15, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8-pre1\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 23:17+1000\n"
-"PO-Revision-Date: 2015-09-30 09:51+1000\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-21 09:51+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spil Star Traders, et simpelt spil med rumhandel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "spil;interstellar;handel;strategi;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "handelsmand"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ugyldig værdi for --max-turn: »%s«\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ugyldig operand »%s«\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ugyldigt spilnummer »%s«\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: ekstra operand »%s«\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -78,7 +95,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prøv »%s --help« for yderligere information.\n"
 
 #: src/trader.c:311
@@ -442,10 +459,10 @@ msgstr "Ingen firmaer på kortet"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1136,12 +1153,12 @@ msgstr "%s: ugyldigt felt på linje %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ugyldigt felt på linje %d: »%s«"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ugyldigt felt på linje %d: »%s«"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1546,19 +1563,18 @@ msgstr "@ Hjælpetekst, side 10\n"
 msgid "  How to Play  "
 msgstr "  Sådan spiller du  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Side %d af %d"
+msgid "Page %1$d of %2$d"
+msgstr "Side %1$d af %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Tryk <MELLEMRUM> for at fortsætte ] "
@@ -1571,19 +1587,19 @@ msgstr "[ Tryk <MELLEMRUM> for at fortsætte ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Tryk <MELLEMRUM> for at fortsætte eller <←> for den forrige side ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: streng har ikke korrekt format: »%s«"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tegn har ugyldig bredde: »%lc«"
 
 #: src/intf.c:434
@@ -1591,11 +1607,6 @@ msgstr "%s: tegn har ugyldig bredde: »%lc«"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminalstørrelse er for lille (%d x %d krævet)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1603,7 +1614,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: »%s«"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1618,7 +1629,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ugyldigt tegn i streng: »%ls«"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1664,7 +1675,7 @@ msgstr "ikke nok hukommelse"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: »%s«"
 
 #: src/utils.c:1081
@@ -1674,65 +1685,40 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: »%lc«"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tilvalg »%s« er tvetydigt; muligheder:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: tilvalget »%s%s« er tvetydigt\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: tilvalg »%s« er tvetydigt\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: tilvalget »%s%s« er tvetydigt; muligheder:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »--%s« tillader ikke et argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: tilvalget blev ikke genkendt »%s%s«\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »%c%s« tillader ikke et argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: tilvalget »%s%s« tillader ikke et argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tilvalg »--%s« kræver et argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: tilvalget »%s%s« kræver et argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tilvalg blev ikke genkendt »--%s«\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tilvalg blev ikke genkendt »%c%s«\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- »%c«\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: tilvalg kræver et argument -- »%c«\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tilvalg »W %s« er tvetydigt\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: tilvalg »-W %s« tillader ikke et argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tilvalg »-W %s« kræver et argument\n"
+msgstr "%s: tilvalget kræver et argument -- »%c«\n"

From 36498ecb3c4c6db9bd9a3b06bc80fa89ed8940b7 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 06:40:46 +1000
Subject: [PATCH 61/99] Modify header wording to suit the Translation Project
 robot requirements

---
 po/en_AU.po | 4 ++--
 po/en_CA.po | 4 ++--
 po/en_GB.po | 4 ++--
 po/en_US.po | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/en_AU.po b/po/en_AU.po
index 15eccb2..6c7c8e0 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 # *                                                                       *
 # *************************************************************************
 #
-# This file is distributed under the same licence as Star Traders.
+# This file is distributed under the same license as the trader package.
 #
 # Contributors:
 #   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-20 09:59+1000\n"
+"PO-Revision-Date: 2017-05-22 06:39+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian)\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index d66c136..ba10b0c 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -5,7 +5,7 @@
 # *                                                                       *
 # *************************************************************************
 #
-# This file is distributed under the same licence as Star Traders.
+# This file is distributed under the same license as the trader package.
 #
 # Contributors:
 #   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-20 10:00+1000\n"
+"PO-Revision-Date: 2017-05-22 06:39+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian)\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9f675c0..4e849d2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 # *                                                                       *
 # *************************************************************************
 #
-# This file is distributed under the same licence as Star Traders.
+# This file is distributed under the same license as the trader package.
 #
 # Contributors:
 #   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-20 10:00+1000\n"
+"PO-Revision-Date: 2017-05-22 06:39+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British)\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index 314cc04..c4844ce 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -5,7 +5,7 @@
 # *                                                                       *
 # *************************************************************************
 #
-# This file is distributed under the same licence as Star Traders.
+# This file is distributed under the same license as the trader package.
 #
 # Contributors:
 #   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-20 10:00+1000\n"
+"PO-Revision-Date: 2017-05-22 06:39+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English\n"
 "Language: en_US\n"

From e8ed7caf985746a37897d32a0eac5ab84492ad89 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 06:46:51 +1000
Subject: [PATCH 62/99] Update fr.po to the latest version from the Translation
 Project

---
 po/fr.po | 179 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 90 insertions(+), 89 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index fa3ede4..fdad02a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # French translation of trader.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the trader package.
-# Frédéric Marchal <fmarchal@perso.be>, 2015.
+# Frédéric Marchal <fmarchal@perso.be>, 2017.
 #
 # Attention: ce fichier ne doit pas contenir d'espace insécable car le
 # programme est compilé avec ncurses qui n'affiche pas correctement
@@ -10,38 +10,55 @@
 # insécable ne seront pas reportées à la ligne suivante.
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8-pre1\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 23:17+1000\n"
-"PO-Revision-Date: 2015-08-27 13:14+0200\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-21 15:20+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "jeu;interstellaire;commerce;stratégie;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "commerce"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
-msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
+msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
-msgstr "%s: opérande invalide « %s »\n"
+msgid "%s: invalid operand '%s'\n"
+msgstr "%s: opérande invalide « %s »\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
-msgstr "%s: numéro de jeu invalide « %s »\n"
+msgid "%s: invalid game number '%s'\n"
+msgstr "%s: numéro de jeu invalide « %s »\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
-msgstr "%s: opérande surnuméraire « %s »\n"
+msgid "%s: extra operand '%s'\n"
+msgstr "%s: opérande surnuméraire « %s »\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
 #. name of the author.  The IPA pronunciation in this comment is in
@@ -77,8 +94,8 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
-msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
+msgid "%s: Try '%s --help' for more information.\n"
+msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
 
 #: src/trader.c:311
 #, c-format
@@ -441,10 +458,10 @@ msgstr "Aucune compagnie sur la carte"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Compagnies"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1130,13 +1147,13 @@ msgstr "%s: champ illégal à la ligne %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
-msgstr "%s: champ illégal à la ligne %d: « %s »"
+msgid "%s: illegal field on line %d: '%s'"
+msgstr "%s: champ illégal à la ligne %d: « %s »"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
-msgstr "%s: valeur illégale à la ligne %d: « %s »"
+msgid "%s: illegal value on line %d: '%s'"
+msgstr "%s: valeur illégale à la ligne %d: « %s »"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
 #, c-format
@@ -1549,19 +1566,18 @@ msgstr "@ Texte d'aide, page 10\n"
 msgid "  How to Play  "
 msgstr "  Comment jouer  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d sur %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d sur %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Appuyez <ESPACE> pour continuer ] "
@@ -1573,31 +1589,26 @@ msgstr "[ Appuyez <ESPACE> pour continuer ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
-msgstr "%s: la chaîne a un format incorrect: « %s »"
+msgid "%s: string has incorrect format: '%s'"
+msgstr "%s: la chaîne a un format incorrect: « %s »"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
-msgstr "%s: caractère avec une largeur illégale: « %lc »"
+msgid "%s: character has illegal width: '%lc'"
+msgstr "%s: caractère avec une largeur illégale: « %lc »"
 
 #: src/intf.c:434
 #, c-format
 msgid "terminal size is too small (%d x %d required)"
 msgstr "la taille du terminal est trop petite (%d x %d requis)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1605,8 +1616,8 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
-msgstr "mkchstr: « %s »"
+msgid "mkchstr: '%s'"
+msgstr "mkchstr: « %s »"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
 #. default value into the input string, if entered as the very first
@@ -1620,8 +1631,8 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
-msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
+msgid "gettxline: illegal character in string: '%ls'"
+msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
 #. "input|No" contain the keycodes used to determine whether a
@@ -1666,8 +1677,8 @@ msgstr "pas assez de mémoire"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
-msgstr "xmbstowcs: « %s »"
+msgid "xmbstowcs: '%s'"
+msgstr "xmbstowcs: « %s »"
 
 #: src/utils.c:1081
 #, c-format
@@ -1676,65 +1687,55 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
-msgstr "xwcrtomb: « %lc »"
+msgid "xwcrtomb: '%lc'"
+msgstr "xwcrtomb: « %lc »"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option « %s » est ambiguë; les possibilités sont:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: l'option « %s%s » est ambiguë\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option « %s » est ambiguë\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option « --%s » n'accepte pas d'argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: option « %s%s » non reconnue\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option « %c%s » n'accepte pas d'argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option « --%s » exige un argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: l'option « %s%s » exige un argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: option « --%s » non reconnue\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: option « %c%s » non reconnue\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: option invalide -- « %c »\n"
+msgstr "%s: option invalide -- « %c »\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: option exige un argument -- « %c »\n"
+msgstr "%s: l'option exige un argument -- « %c »\n"
 
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option « -W %s » est ambiguë\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: option « --%s » n'accepte pas d'argument\n"
 
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option « -W %s » n'accepte pas d'argument\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: option « --%s » non reconnue\n"
 
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option « -W %s » exige un argument\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: option « -W %s » est ambiguë\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: option « -W %s » n'accepte pas d'argument\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: option « -W %s » exige un argument\n"

From 5d9a4476dc19e454f7ddade6f33c3e063fbb0abd Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 06:48:11 +1000
Subject: [PATCH 63/99] Update da.po to the latest version from the Translation
 Project

---
 po/da.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/da.po b/po/da.po
index e98b3d7..4c114b1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Danish Translations for Star Traders                  *
-# *                 Copyright (C) 2012-15, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-21 09:51+1000\n"
+"PO-Revision-Date: 2017-05-21 21:57+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -40,7 +40,7 @@ msgstr "spil;interstellar;handel;strategi;"
 
 #: data/trader.desktop.in:6
 msgid "trader"
-msgstr "handelsmand"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
@@ -1356,7 +1356,7 @@ msgstr ""
 "også låne fra Den Interstellare Handelsbank for at finansiere yderligere køb\n"
 "på aktiebørsen.\n"
 "\n"
-"Galaksens kort er repræsenteret  ved et ^B~x^N x ^B~y^N-gitter. Et typisk afsnit kan\n"
+"Galaksens kort er repræsenteret  ved et ^B~x^N × ^B~y^N-gitter. Et typisk afsnit kan\n"
 "se således ud:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"

From 6e76aa4b8619d914f5ba954120dde8110d2a36ca Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 06:51:26 +1000
Subject: [PATCH 64/99] Update sv.po to the latest version from the Translation
 Project

---
 po/sv.po | 149 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 74 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index f2d4336..a3616da 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,42 +8,59 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
+#   Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8-pre1\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 23:17+1000\n"
-"PO-Revision-Date: 2015-08-30 23:19+0200\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-21 17:41+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.3\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spela Star Traders, ett enkelt spel om interstellär handel"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "spel;interstellär;handel;strategi;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ogiltigt värde för --max-turn: ”%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ogiltig operand ”%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ogiltigt spelnummer ”%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ”%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -78,7 +95,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prova ”%s --help” för mer information.\n"
 
 #: src/trader.c:311
@@ -443,10 +460,10 @@ msgstr "Inga företag på kartan"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Företag"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1136,12 +1153,12 @@ msgstr "%s: ogiltigt fält på rad %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ogiltigt fält på rad %d: ”%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ogiltigt värde på rad %d: ”%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1542,20 +1559,19 @@ msgstr "@ Hjälptext, sida 10\n"
 msgid "  How to Play  "
 msgstr "  Hur man spelar  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Sida %d av %d"
+msgid "Page %1$d of %2$d"
+msgstr "Sida %1$d av %2$d"
 
 # Väljer RETUR för att motverka platsbrist
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Tryck <RETUR> för att fortsätta ] "
@@ -1568,19 +1584,19 @@ msgstr "[ Tryck <RETUR> för att fortsätta ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Tryck <RETUR> för att fortsätta eller <BACKSTEG> för föregående sida ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: sträng har felaktigt format: ”%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tecken har ogiltig bredd: ”%lc”"
 
 #: src/intf.c:434
@@ -1588,11 +1604,6 @@ msgstr "%s: tecken har ogiltig bredd: ”%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminalstorlek är för liten (%d x %d krävs)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1600,7 +1611,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ”%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1615,7 +1626,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ogiltigt tecken i sträng: ”%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1661,7 +1672,7 @@ msgstr "slut på minne"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ”%s”"
 
 #: src/utils.c:1081
@@ -1671,65 +1682,55 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ”%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: flaggan ”%s%s” är tvetydig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: flaggan ”%s” är tvetydig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”--%s” tar inget argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: okänd flagga ”%s%s”\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”%c%s” tar inget argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”%s%s” tar inget argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaggan ”--%s” kräver ett argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: flaggan ”%s%s” kräver ett argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga ”--%s”\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga ”%c%s”\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- ”%c”\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
 
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan ”-W %s” är tvetydig\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan ”--%s” tar inget argument\n"
 
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”-W %s” tar inget argument\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: okänd flagga ”--%s”\n"
 
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan ”-W %s” kräver ett argument\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: flaggan ”-W %s” är tvetydig\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: flaggan ”-W %s” tar inget argument\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: flaggan ”-W %s” kräver ett argument\n"

From 95baa61e374259c8e444a28f2cb2349a96490e3f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 07:02:04 +1000
Subject: [PATCH 65/99] Try to satisfy the very picky Translation Project robot

The TP robot requires a correct Project-Id-Version and a Language-Team
tag with an email address (even if there is no email address).  It also
complains unless a valid current full year is listed on the Contributors
last line.
---
 po/en_AU.po | 8 ++++----
 po/en_CA.po | 8 ++++----
 po/en_GB.po | 8 ++++----
 po/en_US.po | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/po/en_AU.po b/po/en_AU.po
index 6c7c8e0..0ca109d 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,16 +8,16 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 06:39+1000\n"
+"PO-Revision-Date: 2017-05-22 06:58+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
-"Language-Team: English (Australian)\n"
+"Language-Team: English (Australian) <(nothing)>\n"
 "Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index ba10b0c..0121e26 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,16 +8,16 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 06:39+1000\n"
+"PO-Revision-Date: 2017-05-22 06:58+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
-"Language-Team: English (Canadian)\n"
+"Language-Team: English (Canadian) <(nothing)>\n"
 "Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4e849d2..4916a1a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,16 +8,16 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 06:39+1000\n"
+"PO-Revision-Date: 2017-05-22 06:59+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
-"Language-Team: English (British)\n"
+"Language-Team: English (British) <(nothing)>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/en_US.po b/po/en_US.po
index c4844ce..32cba4e 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,16 +8,16 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 06:39+1000\n"
+"PO-Revision-Date: 2017-05-22 07:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
-"Language-Team: English\n"
+"Language-Team: English (US) <(nothing)>\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

From 3993d686c4103265df958340c907e302600dddfd Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 07:26:20 +1000
Subject: [PATCH 66/99] Update fr.po to remove double-spaces in header comment

---
 po/fr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index ae6709f..f2a9524 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@
 #
 # Attention: ce fichier ne doit pas contenir d'espace insécable car le
 # programme est compilé avec Ncurses qui n'affiche pas correctement
-# l'espace insécable.  De plus, il est garanti qu'il n'y aura pas de
-# retour à la ligne forcé.  Les ponctuations qui requierent un espace
+# l'espace insécable. De plus, il est garanti qu'il n'y aura pas de
+# retour à la ligne forcé. Les ponctuations qui requierent un espace
 # insécable ne seront pas reportées à la ligne suivante.
 #
 msgid ""
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 07:15+1000\n"
+"PO-Revision-Date: 2017-05-22 07:24+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"

From 755beff954d6e73c64ebae8248e70f9d6d53977c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 22 May 2017 16:33:02 +1000
Subject: [PATCH 67/99] Update sv.po to the latest version from the Translation
 Project

---
 po/sv.po | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index a3616da..0db8149 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                 Swedish Translations for Star Traders                 *
-# *                   Copyright (C) 2015, John Zaitseff                   *
+# *                 Copyright (C) 2015-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-21 17:41+0200\n"
+"PO-Revision-Date: 2017-05-22 07:17+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -24,7 +24,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
 
 #: data/trader.desktop.in:3 src/intf.c:610
 #, c-format
@@ -1356,7 +1355,7 @@ msgstr ""
 "låna från  den  interstellära handelsbanken  för att finansiera  ytterligare\n"
 "inköp på aktiemarknaden.\n"
 "\n"
-"Kartan över galaxen  representeras av ett rutnät  med storleken ^B~x^N x ^B~y^N.  En\n"
+"Kartan över galaxen  representeras av ett rutnät  med storleken ^B~x^N × ^B~y^N.  En\n"
 "typisk del av den kan vara:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1525,7 +1524,7 @@ msgstr ""
 "När du valt ditt drag går du in i ^BInterstellära aktiemarknaden^N.   Här kan du\n"
 "köpa aktier, sälja dem,  låna från handelsbanken eller betala tillbaka delar\n"
 "av din skuld  (om du har någon).  Notera att varje  företag utfärdar ett be-\n"
-"gränsat antal aktier -- du kan inte köpa  för alltid!  Du kan dock be om ut-\n"
+"gränsat antal aktier — du kan inte köpa  för alltid!  Du kan dock  be om ut-\n"
 "färdande av mer aktier.  Du har större chans att lyckas om du äger en större\n"
 "del av företaget.\n"
 "\n"
@@ -1719,18 +1718,3 @@ msgstr "%s: ogiltig flagga -- ”%c”\n"
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- ”%c”\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan ”--%s” tar inget argument\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: okänd flagga ”--%s”\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: flaggan ”-W %s” är tvetydig\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan ”-W %s” tar inget argument\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: flaggan ”-W %s” kräver ett argument\n"

From 31ea3c584ae435517959f2b4b1dda6f4cc223b3c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 07:55:33 +1000
Subject: [PATCH 68/99] Add comments to trader.desktop.in

---
 .gitattributes         |  1 +
 data/trader.desktop.in | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index b0d2eb8..e42c973 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@ Makefile.am			ident
 /configure.ac			ident
 /build-aux/bootstrap		ident
 /build-aux/msgfmt-desktop	ident
+/data/trader.desktop.in		ident
 /data/trader.svg		ident
 /doc/trader.*			ident
 /po/LINGUAS			ident
diff --git a/data/trader.desktop.in b/data/trader.desktop.in
index ed27f22..c6a1533 100644
--- a/data/trader.desktop.in
+++ b/data/trader.desktop.in
@@ -1,7 +1,32 @@
+#########################################################################
+#                                                                       #
+#             Star Traders: A Game of Interstellar Trading              #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
+#                                                                       #
+#########################################################################
+
+# Author: John Zaitseff <J.Zaitseff@zap.org.au>
+# $Id$
+
+# This file provides a translated desktop entry for Star Traders and
+# conforms to the Desktop Entry Specification v1.1.  This file is
+# distributed under the same licence as Star Traders itself: the GNU
+# General Public License, version 3 or later.
+
 [Desktop Entry]
+# TRANSLATORS: The name of the game.  You may choose to translate it into
+# your own language (recommended) or keep it the same as the English
+# version.  Feel free to look through other translations to see how
+# others have done this.
 Name=Star Traders
 Comment=Play Star Traders, a simple game of interstellar trading
+# TRANSLATORS: A list of keywords describing Star Traders.  By all means
+# add your own keywords!
 Keywords=game;interstellar;trading;strategy;
+# TRANSLATORS: This string is the name of the icon to use.  The Desktop
+# Entry Specification states it is translatable, but unless you provide a
+# matching icon, please leave it as "trader": this will use trader.svg
+# and the various trader.png files in the data source code directory.
 Icon=trader
 Exec=trader
 TryExec=trader

From 8f77eada338390da3a3bf890399f23339a2314a7 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 08:04:16 +1000
Subject: [PATCH 69/99] Update all PO files as part of "make dist"

---
 po/da.po    | 20 +++++++++++++++-----
 po/de.po    | 22 ++++++++++++++++------
 po/en_AU.po | 20 +++++++++++++++-----
 po/en_CA.po | 20 +++++++++++++++-----
 po/en_GB.po | 20 +++++++++++++++-----
 po/en_US.po | 20 +++++++++++++++-----
 po/eo.po    | 22 ++++++++++++++++------
 po/fi.po    | 22 ++++++++++++++++------
 po/fr.po    | 20 +++++++++++++++-----
 po/hr.po    | 22 ++++++++++++++++------
 po/hu.po    | 22 ++++++++++++++++------
 po/nb.po    | 22 ++++++++++++++++------
 po/ru.po    | 22 ++++++++++++++++------
 po/sr.po    | 22 ++++++++++++++++------
 po/sv.po    | 20 +++++++++++++++-----
 15 files changed, 233 insertions(+), 83 deletions(-)

diff --git a/po/da.po b/po/da.po
index a10e6c0..8f5eabc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-21 21:57+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -25,20 +25,30 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spil Star Traders, et simpelt spil med rumhandel"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "spil;interstellar;handel;strategi;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/de.po b/po/de.po
index 5de12fc..e1b32b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,9 +12,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 10:03+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 0ca109d..0327f0f 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 06:58+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 0121e26..a3acaf2 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 06:58+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 4916a1a..647beed 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 06:59+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/en_US.po b/po/en_US.po
index 32cba4e..dd5eeae 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 07:00+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/eo.po b/po/eo.po
index 9eae679..199de88 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,9 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 10:04+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -25,20 +25,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/fi.po b/po/fi.po
index fe3ac10..63e18ac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,9 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 10:06+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -25,20 +25,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Tähtikauppiaat"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/fr.po b/po/fr.po
index f2a9524..97c01ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 07:24+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -32,20 +32,30 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "jeu;interstellaire;commerce;stratégie;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/hr.po b/po/hr.po
index ad427b8..6c21abb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -12,9 +12,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 10:07+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/hu.po b/po/hu.po
index ee0e749..04076c7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,9 +12,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 09:50+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/nb.po b/po/nb.po
index ca34053..5ddca8b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,9 +12,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -24,20 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spill Star Traders, et enkelt spill med interstellar handel"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/ru.po b/po/ru.po
index e352cc4..7b3881b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,9 +15,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -27,20 +27,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Звёздные торговцы"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Играть в «Звёздные торговцы», простую игру о межзвёздной торговле"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "игра;межзвёздная;торговля;стратегия;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/sr.po b/po/sr.po
index 7652d8c..c131783 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,9 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-20 09:51+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -25,20 +25,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Звездани трговци"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Играјте Звездане трговце, једноставну игру међузвезданог трговања"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/sv.po b/po/sv.po
index 9634766..97a13e3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 07:57+1000\n"
 "PO-Revision-Date: 2017-05-22 07:17+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -25,20 +25,30 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spela Star Traders, ett enkelt spel om interstellär handel"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "spel;interstellär;handel;strategi;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 

From ab5a0e1e803d098417682c2726fc0cf7fd86176d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 08:10:28 +1000
Subject: [PATCH 70/99] Set the version number to 7.10-pre2 to allow a second
 prerelease

---
 configure.ac | 2 +-
 po/da.po     | 4 ++--
 po/de.po     | 4 ++--
 po/en_AU.po  | 4 ++--
 po/en_CA.po  | 4 ++--
 po/en_GB.po  | 4 ++--
 po/en_US.po  | 4 ++--
 po/eo.po     | 4 ++--
 po/fi.po     | 4 ++--
 po/fr.po     | 4 ++--
 po/hr.po     | 4 ++--
 po/hu.po     | 4 ++--
 po/nb.po     | 4 ++--
 po/ru.po     | 4 ++--
 po/sr.po     | 4 ++--
 po/sv.po     | 4 ++--
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57d1861..cd2d4c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-AC_INIT([Star Traders], [7.10-pre1], [J.Zaitseff@zap.org.au], [trader],
+AC_INIT([Star Traders], [7.10-pre2], [J.Zaitseff@zap.org.au], [trader],
         [http://www.zap.org.au/software/trader/])
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
diff --git a/po/da.po b/po/da.po
index 8f5eabc..0f8d102 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-21 21:57+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff --git a/po/de.po b/po/de.po
index e1b32b8..9a04166 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 10:03+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index 0327f0f..9cc3f67 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 06:58+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index a3acaf2..2bd88a0 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 06:58+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 647beed..806e7c6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 06:59+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index dd5eeae..35added 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 07:00+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
 "Language: en_US\n"
diff --git a/po/eo.po b/po/eo.po
index 199de88..6502aba 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 10:04+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
diff --git a/po/fi.po b/po/fi.po
index 63e18ac..444c762 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 10:06+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
diff --git a/po/fr.po b/po/fr.po
index 97c01ae..4e977f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 07:24+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
diff --git a/po/hr.po b/po/hr.po
index 6c21abb..17a01a0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 10:07+1000\n"
+"PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
diff --git a/po/hu.po b/po/hu.po
index 04076c7..17cabe7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 09:50+1000\n"
+"PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
diff --git a/po/nb.po b/po/nb.po
index 5ddca8b..04e146d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 09:51+1000\n"
+"PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
diff --git a/po/ru.po b/po/ru.po
index 7b3881b..c2f1b79 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,10 +15,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 09:51+1000\n"
+"PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
diff --git a/po/sr.po b/po/sr.po
index c131783..59be3f2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-20 09:51+1000\n"
+"PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
diff --git a/po/sv.po b/po/sv.po
index 97a13e3..26d0b61 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-22 07:17+1000\n"
+"PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"

From 79edc13eb3fe6fd1036feb75372a569ec2a8fd4f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 08:25:32 +1000
Subject: [PATCH 71/99] Replace U+00A0 NO-BREAK SPACE with U+0020 SPACE

Ncurses does not handle U+00A0 correctly, so we must use U+0020.  These
particular strings do NOT use Ncurses, instead using printf() to stdout
directly, but we should be consistent across all strings.
---
 po/fr.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 4e977f3..f069d01 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-23 08:20+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -62,22 +62,22 @@ msgstr "trader"
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: '%s'\n"
-msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
+msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
 
 #: src/trader.c:251
 #, c-format
 msgid "%s: invalid operand '%s'\n"
-msgstr "%s: opérande invalide « %s »\n"
+msgstr "%s: opérande invalide « %s »\n"
 
 #: src/trader.c:260
 #, c-format
 msgid "%s: invalid game number '%s'\n"
-msgstr "%s: numéro de jeu invalide « %s »\n"
+msgstr "%s: numéro de jeu invalide « %s »\n"
 
 #: src/trader.c:269
 #, c-format
 msgid "%s: extra operand '%s'\n"
-msgstr "%s: opérande surnuméraire « %s »\n"
+msgstr "%s: opérande surnuméraire « %s »\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
 #. name of the author.  The IPA pronunciation in this comment is in
@@ -114,7 +114,7 @@ msgstr ""
 #: src/trader.c:308
 #, c-format
 msgid "%s: Try '%s --help' for more information.\n"
-msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
+msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
 
 #: src/trader.c:311
 #, c-format
@@ -1166,12 +1166,12 @@ msgstr "%s: champ illégal à la ligne %d"
 #: src/fileio.c:51
 #, c-format
 msgid "%s: illegal field on line %d: '%s'"
-msgstr "%s: champ illégal à la ligne %d: « %s »"
+msgstr "%s: champ illégal à la ligne %d: « %s »"
 
 #: src/fileio.c:55
 #, c-format
 msgid "%s: illegal value on line %d: '%s'"
-msgstr "%s: valeur illégale à la ligne %d: « %s »"
+msgstr "%s: valeur illégale à la ligne %d: « %s »"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
 #, c-format
@@ -1615,12 +1615,12 @@ msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente
 #: src/intf.c:110
 #, c-format
 msgid "%s: string has incorrect format: '%s'"
-msgstr "%s: la chaîne a un format incorrect: « %s »"
+msgstr "%s: la chaîne a un format incorrect: « %s »"
 
 #: src/intf.c:126
 #, c-format
 msgid "%s: character has illegal width: '%lc'"
-msgstr "%s: caractère avec une largeur illégale: « %lc »"
+msgstr "%s: caractère avec une largeur illégale: « %lc »"
 
 #: src/intf.c:434
 #, c-format
@@ -1635,7 +1635,7 @@ msgstr "mkchstr_conv: NUL"
 #: src/intf.c:1568
 #, c-format
 msgid "mkchstr: '%s'"
-msgstr "mkchstr: « %s »"
+msgstr "mkchstr: « %s »"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
 #. default value into the input string, if entered as the very first
@@ -1650,7 +1650,7 @@ msgstr "=;"
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
 msgid "gettxline: illegal character in string: '%ls'"
-msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
+msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
 #. "input|No" contain the keycodes used to determine whether a
@@ -1696,7 +1696,7 @@ msgstr "pas assez de mémoire"
 #: src/utils.c:1041
 #, c-format
 msgid "xmbstowcs: '%s'"
-msgstr "xmbstowcs: « %s »"
+msgstr "xmbstowcs: « %s »"
 
 #: src/utils.c:1081
 #, c-format
@@ -1706,39 +1706,39 @@ msgstr "xwcrtomb: NUL"
 #: src/utils.c:1086
 #, c-format
 msgid "xwcrtomb: '%lc'"
-msgstr "xwcrtomb: « %lc »"
+msgstr "xwcrtomb: « %lc »"
 
 #: lib/getopt.c:278
 #, c-format
 msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: l'option « %s%s » est ambiguë\n"
+msgstr "%s: l'option « %s%s » est ambiguë\n"
 
 #: lib/getopt.c:284
 #, c-format
 msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
+msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
 
 #: lib/getopt.c:319
 #, c-format
 msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: option « %s%s » non reconnue\n"
+msgstr "%s: option « %s%s » non reconnue\n"
 
 #: lib/getopt.c:345
 #, c-format
 msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
+msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
 
 #: lib/getopt.c:360
 #, c-format
 msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: l'option « %s%s » exige un argument\n"
+msgstr "%s: l'option « %s%s » exige un argument\n"
 
 #: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: option invalide -- « %c »\n"
+msgstr "%s: option invalide -- « %c »\n"
 
 #: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'option exige un argument -- « %c »\n"
+msgstr "%s: l'option exige un argument -- « %c »\n"

From 62274548136768c579c2db132ae764644568bc44 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 08:34:38 +1000
Subject: [PATCH 72/99] Update hu.po to the latest version from the Translation
 Project

---
 po/hu.po | 140 +++++++++++++++++++++++++------------------------------
 1 file changed, 63 insertions(+), 77 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 509d39c..c0e8eab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # *************************************************************************
 # *                                                                       *
 # *                Hungarian Translations for Star Traders                *
-# *                 Copyright (C) 2012-14, John Zaitseff                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
@@ -9,41 +9,58 @@
 #
 # Contributors:
 #
-#   Balázs Úr <urbalazs@gmail.com>, 2014, 2015.
+#   Balázs Úr <urbalazs@gmail.com>, 2014, 2015, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8-pre1\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 23:17+1000\n"
-"PO-Revision-Date: 2015-08-30 09:46+0200\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-22 21:04+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása"
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "játék;csillagközi;kereskedés;stratégia;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "kereskedő"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: érvénytelen érték a --max-turn kapcsolóhoz: „%s”\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: érvénytelen operandus: „%s”\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: érvénytelen játékszám: „%s”\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operandus: „%s”\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -80,7 +97,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: További információkért próbálja a(z) „%s --help” parancsot.\n"
 
 #: src/trader.c:311
@@ -440,10 +457,10 @@ msgstr "Nincsenek társaságok a térképen"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Társaság"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1130,12 +1147,12 @@ msgstr "%s: szabálytalan mező a(z) %d. sorban"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: szabálytalan mező a(z) %d. sorban: „%s”"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: szabálytalan érték a(z) %d. sorban: „%s”"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1538,19 +1555,18 @@ msgstr "@ Súgószöveg, 10. oldal\n"
 msgid "  How to Play  "
 msgstr "  A játék menete  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "%d / %d oldal"
+msgid "Page %1$d of %2$d"
+msgstr "%1$d / %2$d oldal"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz ] "
@@ -1562,19 +1578,19 @@ msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Nyomja le a <SZÓKÖZT> a folytatáshoz vagy <BACKSPACE>-t az előző oldalhoz] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: a szövegnek helytelen formátuma van: „%s”"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: a karakternek szabálytalan szélessége van: „%lc”"
 
 #: src/intf.c:434
@@ -1582,11 +1598,6 @@ msgstr "%s: a karakternek szabálytalan szélessége van: „%lc”"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "a terminál mérete túl kicsi (%d x %d szükséges)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1594,7 +1605,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s”"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1609,7 +1620,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: érvénytelen karakter a szövegben: „%ls”"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1655,7 +1666,7 @@ msgstr "nincs elég memória"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s”"
 
 #: src/utils.c:1081
@@ -1665,65 +1676,40 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc”"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű; lehetőségek:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ismeretlen „%s%s” kapcsoló\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „%s%s” kapcsoló nem enged meg argumentumot\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: a(z) „%s%s” kapcsolóhoz egy argumentum szükséges\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ismeretlen „--%s” kapcsoló\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen kapcsoló -- „%c”\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n"

From f9d4b1cb96bc585d347abc96cdfb969919b14b5f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 08:55:44 +1000
Subject: [PATCH 73/99] Update all auto-generated files

These files have been created by running ./build-aux/bootstrap with
Gnulib as at commit abdd68df1a22db62a7eb68ed93fed51f7988578e (with a date
stamp of Mon May 22 22:26:29 2017 +0200), Autoconf 2.69, Automake 1.15
and Gettext 0.19.8.1.
---
 Makefile.in          |  2 +-
 build-aux/.gitignore | 15 --------
 configure            | 83 +++++++++++++++++++++++++++++---------------
 m4/glibc2.m4         |  2 +-
 m4/gnulib-tool.m4    |  2 +-
 m4/iconv.m4          | 32 +++++++++++------
 m4/intdiv0.m4        |  4 +--
 m4/intl.m4           |  2 +-
 m4/intldir.m4        |  6 ++--
 m4/intmax.m4         |  2 +-
 m4/inttypes-pri.m4   |  2 +-
 m4/inttypes_h.m4     |  2 +-
 m4/lcmessage.m4      |  4 +--
 m4/lock.m4           | 11 ++++--
 m4/printf-posix.m4   |  2 +-
 m4/size_max.m4       |  2 +-
 m4/stdint_h.m4       |  2 +-
 m4/strstr.m4         |  5 ++-
 m4/threadlib.m4      |  8 +++--
 m4/uintmax_t.m4      |  2 +-
 m4/visibility.m4     |  2 +-
 m4/xsize.m4          |  2 +-
 22 files changed, 114 insertions(+), 80 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3901f27..410e0ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,7 +236,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \
 	build-aux/README build-aux/compile build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 9f9d26a..e69de29 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,15 +0,0 @@
-/ar-lib
-/compile
-/config.guess
-/config.rpath
-/config.sub
-/depcomp
-/install-sh
-/missing
-
-/snippet/
-/snippet/_Noreturn.h
-/snippet/arg-nonnull.h
-/snippet/c++defs.h
-/snippet/unused-parameter.h
-/snippet/warn-on-use.h
diff --git a/configure b/configure
index 828557e..298c764 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Star Traders 7.10-pre1.
+# Generated by GNU Autoconf 2.69 for Star Traders 7.10-pre2.
 #
 # Report bugs to <J.Zaitseff@zap.org.au>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Star Traders'
 PACKAGE_TARNAME='trader'
-PACKAGE_VERSION='7.10-pre1'
-PACKAGE_STRING='Star Traders 7.10-pre1'
+PACKAGE_VERSION='7.10-pre2'
+PACKAGE_STRING='Star Traders 7.10-pre2'
 PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
 PACKAGE_URL='http://www.zap.org.au/software/trader/'
 
@@ -2021,7 +2021,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Star Traders 7.10-pre1 to adapt to many kinds of systems.
+\`configure' configures Star Traders 7.10-pre2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2092,7 +2092,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Star Traders 7.10-pre1:";;
+     short | recursive ) echo "Configuration of Star Traders 7.10-pre2:";;
    esac
   cat <<\_ACEOF
 
@@ -2209,7 +2209,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Star Traders configure 7.10-pre1
+Star Traders configure 7.10-pre2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2861,7 +2861,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Star Traders $as_me 7.10-pre1, which was
+It was created by Star Traders $as_me 7.10-pre2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3761,7 +3761,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='trader'
- VERSION='7.10-pre1'
+ VERSION='7.10-pre2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7668,15 +7668,27 @@ int result = 0;
 #endif
   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
      provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
+  {
+    /* Try standardized names.  */
+    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+    /* Try IRIX, OSF/1 names.  */
+    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+    /* Try AIX names.  */
+    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+    /* Try HP-UX names.  */
+    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+      result |= 16;
+    if (cd1 != (iconv_t)(-1))
+      iconv_close (cd1);
+    if (cd2 != (iconv_t)(-1))
+      iconv_close (cd2);
+    if (cd3 != (iconv_t)(-1))
+      iconv_close (cd3);
+    if (cd4 != (iconv_t)(-1))
+      iconv_close (cd4);
+  }
   return result;
 
   ;
@@ -10172,15 +10184,27 @@ int result = 0;
 #endif
   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
      provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
+  {
+    /* Try standardized names.  */
+    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+    /* Try IRIX, OSF/1 names.  */
+    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+    /* Try AIX names.  */
+    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+    /* Try HP-UX names.  */
+    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+      result |= 16;
+    if (cd1 != (iconv_t)(-1))
+      iconv_close (cd1);
+    if (cd2 != (iconv_t)(-1))
+      iconv_close (cd2);
+    if (cd3 != (iconv_t)(-1))
+      iconv_close (cd3);
+    if (cd4 != (iconv_t)(-1))
+      iconv_close (cd4);
+  }
   return result;
 
   ;
@@ -16556,6 +16580,9 @@ main ()
         if (!strstr (haystack, needle))
           result |= 1;
       }
+    /* Free allocated memory, in case some sanitizer is watching.  */
+    free (haystack);
+    free (needle);
     return result;
 
   ;
@@ -20101,7 +20128,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Star Traders $as_me 7.10-pre1, which was
+This file was extended by Star Traders $as_me 7.10-pre2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20168,7 +20195,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Star Traders config.status 7.10-pre1
+Star Traders config.status 7.10-pre2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
index 785bba0..926edba 100644
--- a/m4/glibc2.m4
+++ b/m4/glibc2.m4
@@ -1,5 +1,5 @@
 # glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2016 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gnulib-tool.m4 b/m4/gnulib-tool.m4
index 0d2ee44..2e2d8f6 100644
--- a/m4/gnulib-tool.m4
+++ b/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index bdafc54..81ac1a6 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial 20
+# iconv.m4 serial 21
 dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -167,15 +167,27 @@ AC_DEFUN([AM_ICONV_LINK],
 #endif
   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
      provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
+  {
+    /* Try standardized names.  */
+    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+    /* Try IRIX, OSF/1 names.  */
+    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+    /* Try AIX names.  */
+    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+    /* Try HP-UX names.  */
+    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+      result |= 16;
+    if (cd1 != (iconv_t)(-1))
+      iconv_close (cd1);
+    if (cd2 != (iconv_t)(-1))
+      iconv_close (cd2);
+    if (cd3 != (iconv_t)(-1))
+      iconv_close (cd3);
+    if (cd4 != (iconv_t)(-1))
+      iconv_close (cd4);
+  }
   return result;
 ]])],
           [am_cv_func_iconv_works=yes], ,
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index a442fd5..bbbc114 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,5 +1,5 @@
 # intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2008, 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -38,7 +38,7 @@ static void
 sigfpe_handler (int sig)
 {
   /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
+  _exit (sig != SIGFPE);
 }
 
 int x = 1;
diff --git a/m4/intl.m4 b/m4/intl.m4
index 5cd7863..42fac95 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,5 +1,5 @@
 # intl.m4 serial 29 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intldir.m4 b/m4/intldir.m4
index 3ca0d14..8d74bda 100644
--- a/m4/intldir.m4
+++ b/m4/intldir.m4
@@ -1,5 +1,5 @@
-# intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+# intldir.m4 serial 3 (gettext-0.19.9)
+dnl Copyright (C) 2006, 2009-2014, 2016-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@ dnl by the GNU Library General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-AC_PREREQ([2.52])
+AC_PREREQ([2.60])
 
 dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
 AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index 1a47107..b432fae 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,5 +1,5 @@
 # intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2005, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index ae20183..2055787 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 7657119..9240305 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
 # inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index 1e40e44..1c24d6d 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,6 +1,6 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lock.m4 b/m4/lock.m4
index 1e83e23..cb04a67 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
+# lock.m4 serial 14
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,11 +12,16 @@ AC_DEFUN([gl_LOCK],
   if test "$gl_threads_api" = posix; then
     # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
+    has_rwlock=false
     AC_CHECK_TYPE([pthread_rwlock_t],
-      [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
+      [has_rwlock=true
+       AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
          [Define if the POSIX multithreading library has read/write locks.])],
       [],
       [#include <pthread.h>])
+    if $has_rwlock; then
+      gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+    fi
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
     AC_COMPILE_IFELSE([
       AC_LANG_PROGRAM(
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index f9088c0..0577933 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -1,5 +1,5 @@
 # printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index de69025..05ad1b6 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,5 +1,5 @@
 # size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index f823b94..786eaa3 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
 # stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 9f7da64..4b472ee 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,4 +1,4 @@
-# strstr.m4 serial 17
+# strstr.m4 serial 18
 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -99,6 +99,9 @@ static void quit (int sig) { _exit (sig + 128); }
         if (!strstr (haystack, needle))
           result |= 1;
       }
+    /* Free allocated memory, in case some sanitizer is watching.  */
+    free (haystack);
+    free (needle);
     return result;
     ]])],
         [gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no],
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index b43534e..f79fde2 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -1,5 +1,5 @@
-# threadlib.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
+# threadlib.m4 serial 12
+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -195,8 +195,10 @@ int main ()
              # Therefore pthread_in_use() needs to actually try to create a
              # thread: pthread_create from libc will fail, whereas
              # pthread_create will actually create a thread.
+             # On Solaris 10 or newer, this test is no longer needed, because
+             # libc contains the fully functional pthread functions.
              case "$host_os" in
-               solaris* | hpux*)
+               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
                  AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
                    [Define if the pthread_in_use() detection is hard.])
              esac
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index 30f4dd5..7e3b3df 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,5 +1,5 @@
 # uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2007-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/visibility.m4 b/m4/visibility.m4
index e99e3fb..ce00e72 100644
--- a/m4/visibility.m4
+++ b/m4/visibility.m4
@@ -1,5 +1,5 @@
 # visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 16764e8..5f85057 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,5 +1,5 @@
 # xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

From e19f1b99b2ef5af7c7369348401d49837d8702f2 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 09:04:16 +1000
Subject: [PATCH 74/99] Update all PO/POT/GMO files as part of "make dist"

---
 po/da.gmo      | Bin 30123 -> 30291 bytes
 po/da.po       |   2 +-
 po/de.gmo      | Bin 31032 -> 31037 bytes
 po/de.po       |   2 +-
 po/en@quot.gmo | Bin 29720 -> 29720 bytes
 po/en@quot.po  |  24 +++++++++++++++++-------
 po/en_AU.gmo   | Bin 29755 -> 29772 bytes
 po/en_AU.po    |   2 +-
 po/en_CA.gmo   | Bin 29753 -> 29770 bytes
 po/en_CA.po    |   2 +-
 po/en_GB.gmo   | Bin 29752 -> 29769 bytes
 po/en_GB.po    |   2 +-
 po/en_US.gmo   | Bin 29741 -> 29763 bytes
 po/en_US.po    |   2 +-
 po/eo.gmo      | Bin 30168 -> 30173 bytes
 po/eo.po       |   2 +-
 po/fi.gmo      | Bin 30852 -> 30857 bytes
 po/fi.po       |   2 +-
 po/fr.gmo      | Bin 31495 -> 31626 bytes
 po/fr.po       |   2 +-
 po/hr.gmo      | Bin 30354 -> 30359 bytes
 po/hr.po       |   2 +-
 po/hu.gmo      | Bin 32072 -> 32238 bytes
 po/hu.po       |   2 +-
 po/nb.gmo      | Bin 29873 -> 29878 bytes
 po/nb.po       |   2 +-
 po/ru.gmo      | Bin 39007 -> 39012 bytes
 po/ru.po       |   2 +-
 po/sr.gmo      | Bin 37555 -> 37560 bytes
 po/sr.po       |   2 +-
 po/sv.gmo      | Bin 30105 -> 30262 bytes
 po/sv.po       |   2 +-
 po/trader.pot  |  22 ++++++++++++++++------
 33 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/po/da.gmo b/po/da.gmo
index 15552f6625dc0792bb6a45a1c8410e338b340dfe..f61890fa24063529996afdb598fcd012861778db 100644
GIT binary patch
delta 4011
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

delta 3858
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
Py`MMqXZ0RkzdPjr-caQM

diff --git a/po/da.po b/po/da.po
index 0f8d102..8ebe308 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.gmo b/po/de.gmo
index 8405d1f90f333c52fe1382a45e3d391321c2d858..cbaf1ef38570010c38a2d16bd359b5e9312560c2 100644
GIT binary patch
delta 1732
zcmXZcdrZw?7{Kx8MCH;=3Y9n!a!+@;{862fR4x@Nm&{${mZMqD$c!OF&E_^%%f=dM
z#zrw4mYK^R%x(RFzcMWA4`$^1c;Bt{dEWQ;d#}&)JGXy0+I~2$H~M%Q9U>KJB7q_j
zk|8n#qj5OSz+ha0!*CN0#RC|D=g=Q-+x|zW?{{K2cH;>2bD8lIF_Lx$2H+}}cqE8m
z8yz}uKWe)kb%7@90}Q3ziG#5Rb>e=Rrhgm`qCE?B<N3(iQjRCF1?w;)%WUi|7SZm>
z@`%I{<jfK2i+hoGr3RDn2_~Rdw#aBq#xYoeqi`Qi!bY5iFKvIHxu$<CM$^9tqi{Fs
zxHC8v+dKq%lCL-x{c=Q-FdlWlM%0OqqAuKSpMS<Fv?J!31I$ITDAhO<@1xH12X&r=
zTyydw^rpSd>T%nk+FD~hY&~wRx1L2WCb)!}vPL|Qw@_11m}gvvdV^J{H_(DwL$9$v
ze#enQ{(lh!&=Hnz2F9S~I29*g9wuTH@+a5$SBkx;sVSW=;=~gehBr`a<tggCA5k~b
zjp;ak0d<0#aWw18Re}L@JjXzMhkDgrs3{3rXo@NsHFpJg5#89Aq8YY`Ir>o9i_Hc)
zicJxJLj4MQP-`c!gj?gicpT#pd9|E_vcCLYA>z^(R*Fz>Qiy(d0fX==Y7XzB6FadM
zd+`X?mYL5ge3i&-+9`N}h1{s~3|UKEc(DnLq<v|<shxZ1aq;3e0zGj;IbQ-6qh4(j
zPRIA?#L&$mT#6(ihn7RAx&44?=-6V4E(0}ndyu-8CM>{i)SJkxAPu;&g8NS=sH3Bu
zjl4m9;q(rXWq1emcOY!1xq(E~6D&sk&MQ%`_#}?PX50V5w!h*y`hzM(VlV}DzB1GU
zS66cXdbJI7=!6fgA5j<TMJGn?G6QBKDVNpAjmid0#d6!eY`tP_wq8fwXe;{TGwTPB
z4Z5s9tv+ruAOv;5RO>7ZrJZ9fv%0Ova1hTMtT(NXt#2`y=U-3{?)gjLOW@osG7w`>
zi!K4lh`6lT_IWPq`%6(bQicKOMjdw$b%E39gI91UwqO!=*nX+{|CtAiuL&dq|DUvV
qy#Ja+@5x)YuZcTVo0jbx?~I+E8awS&XIhlTDXFn3tv=~-N&f)Up6T-d

delta 1726
zcmXZcdrZzz7{Kx8&83lUQtrH!`>e~Gl7=X6<eK|Nt`q)<>=m-%H)C_BmCJ0D3^QV;
z&2<c8=JE$~TYumWV^~`oX5=#8$9cBubI$pl>vNvdjW50{Uwju%wDoFzB4v3Z(ZcT-
zkp%3GJunM9;&kkSOR+P0*c}gHBsN(4ZPfma*bSSo7lsGj_<q=vdM-xcyr6gzL!p!g
z9k>y-UWvLuop}S}sW)OAHlt45s=&1;VJ!7*)Qyiv)|O>hh4r`}bH}=kJ;zzpo5y-0
z0SX1<L|Wr|q_1qkp?D96;2%uJK%q!qoP|la0S99(rsHF4|7-1u<3;+=J{c2nHR`wn
zn2J|C3VM={*bl=e5Oz#K9Z-Tg@ix?juiE#wm_j{aqB}qkxkahK;dmW&o*$_5q)u`t
zpNeg$mzrM43KixibE~=2tTYc|7!w>py|P+7iWgC@plGslF=_<MQ6o@~nnO>q9e&2%
zq>_B25Jf|$DQ;jg>K$j|AS}d8EJuFi41bET1@&rX7m4_BH+IEysJU_<b>7#g8)?FP
z>@!tl1TM#9)|XQh+SBk5qwxi5sNbVrNyIdlQ~}hxn}WwMgsn-MxalHiTXDMCZUcAc
zxFmjq`U;v+bEo}W5}JM~*w-iWWIkhAU%oF832KLhBIKDAVFx^nF?b5~4lko08*wkT
z;4a*;$UUq0#UdlAXJ8Erg;3{-UCPS}BhOHu-;w1mcdnrqq~j+Fdg9bl5%NlAqK38(
zhv7@~W6TN>f+Fe2p=Ar|-M+#+{EeD)xhvh(twr)$>Tm`&p+;hKnaDsaDI@;*6!y_@
zlZ`w>?NGIve-3yF_5VPpau<O#)DuiYednuCL%au*@U*o*vie8tPkY1~kpY;2I$tsB
zfh*P!e+_L74Lad1^EK*1E$GKCYu$ih$d$_iB%-neb8wl}kDDjW)8<*!jh@Fyd|<xv
ztnl9aYWmi>0nw-f2ASCyPrbk_HbdrijOBZcdBMD6KF5xH|A2aM?<a+D3f(IR6DFf3
zT`F=TGRhod-^Zc$pMkoOVvNEN>bT9Q3shlSJc*sL9<%VSwg196?Hab;z4rwCf6|75
iktLbc)p>>CY5w#;P9VGbU0$M=({j=>8Y1!oS^og;bLcMs

diff --git a/po/de.po b/po/de.po
index 9a04166..b2e8b2f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 3db4354bd4fa706fa692e2f2c889a4837182b102..3ae2a99652a3f1b5775f28fec1ae6faf215953d1 100644
GIT binary patch
delta 40
qcmbR7f^o(R#tp}u7>y<$ck*O6Rxq%%GBBJh?yLx7Z?<>7X#fBxBn;aC

delta 40
qcmbR7f^o(R#tp}u7!4;Mck*O6P%t#IGP0N~?yLx7Z?<>7X#fBw#0=U1

diff --git a/po/en@quot.po b/po/en@quot.po
index c64433a..47fd5c9 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-23 09:01+1000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -39,20 +39,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
diff --git a/po/en_AU.gmo b/po/en_AU.gmo
index 0c356969e4cdf0433c9f606180dfa4b36dc48947..840928371d04d1f33ccb8648bc7535b39a20fee7 100644
GIT binary patch
delta 1785
zcmXZcdq|ac7{KvImu{tY)MdHm(rL{ykG|(<sb{X5m$Y>;N76>iYE#O~JSUYJB)v4Y
z*s2Akx$uu5ox8AN12<@w9BdI3LK_vq+MuF8$`~`lpq9Ar!~4L2&-?r?&+mSIx)U{W
zC+gc%vF?c|k%2OiSt3$aA(D(6aW*z%BJQ*DqxdZGpv6C60`Um?@K19TQ-~kq3z%3b
zl8$+(@jBG@t(D?R93Nd2s2`yw?7=zMk2<j*F$piBPT(e{;RI@;<dxn;Gx0g%0$hP>
zu?r95NsO!V`kh98a<R%4S-?kfwa7Fq#yorlbFdY4pil96{0?8l->rNcUn2Ic63ND;
zsO{@f%lDwR??+wvIn<rFg^MxTea-8Thgz{3GqDAAC5JJHUt$(sw|ELQL2$K5F4kiK
z9z<>b3ogQO)P8AeMCRfOd<r+2?iTxa$J}nVm|?TS+>OyB*n@h;dr^<5$Nb71MxD@Q
zoR3eh6-mWh)FZ1zcFL7HD`-c(eD9;4^)bxFFED^tuoPq0iEx}!j=ItVs5^Jo{2MjT
zB+kUd8j&JQ#}eF#g?I$B7+=owF@u6p^x*{R*2S#%?nXXl5Z9p&v<pAPUX8glX|*Ez
z+0)WG?{fb3hDbd1*HAC<ZOp+Zc$Ie9Z;IR_o_vdiGQQm1%*Dh1@MSEl_g+H;bwXX3
ziigZWa~SmquA#2@AJi4f7Lf=8g-|E*_1g@}nVrFT#5Wqe2~DB<n2MZ6@6s*UA@V8>
zs!_N60Q&J~)Q+R5&t`g)$a1X3EIfiC{2udg4E3_5H+%U)$fimc>gyOm&3Ct%{V(U^
znHG`HnDH9ag!kL{lfaa)m#6`?gNx~S0yWXF)n7Lsnn@9FLAj{yYj7ckQ73jB^*Ihj
zTrcq-)^H3nsYu-EH7G!R_qC}16YnA$Cf&$<r5AO=eHg%D)cP^=f%(vUgnB2Qpbuxc
z?cT?Hv(T)-I2vp~?XcD2_pJT{OrpHU{M<ZaUc_YT|1$qIqdUBQDW;pvM*<B?a5`3@
z4qR&uHlwaIY<8eNtKArj`%y39C#d}fQ1g9b@mY)^zJNO6OQ?71CenYd_&U93GuzBT
zO|WdJB;n&FG5$z<W3c<zvQ_y78BR&a2`mmcjx%F@jsNw=T}>TL;WmH8w$8>-M$icq
l`JE;HAnl4nPH}grd~1A0>B6>f=Z>bf?TeNT^_8D={s*!C^|k;2

delta 1738
zcmXZbd1%jZ7{Kx8#}Kp4Y&J8)_H&JGb~!fJ_|2SiMhqLv99x(xx%y&8{_qELB`HTC
zn`9|kA&QJbQdTk(HMS<@${(Be)90yQy*|(9c)p+G`MqfN)iwKWRd@A{`9v;H6^Rs)
zv|N$in1@lg40~a@^&h|p;*%C%!w}*+48vz;1NI^QigDP112JxzizlMaUp`Gd38qm-
zhq@CrVFgCxany}n$8fxlx`9{NA3vie^5waWhGPtI0_NZZ+>870BK|{NcYeAEKe;#E
z6B$CoH$x-{hhYjP;Rsxgy5KOz;$@7-2iD(&Ly6mQ7!H}~=I5jKm!i%;j(QWds5kK%
zN8%5UhJGM!mK(^%1mXhJlkCHEJcE9$x3~>8LHuksi}{#=yHV%g#6)aDT^Bq@q#usL
z&N$2T=2~N+xx_3m3(aD4Ep{S7De4<<M17(P^Q>8ex}irn7=L45jLmmXmWdqPlU(aq
zjaqzLP~Z9xCgEvJ!^b!Qe<9B(>2uvlccETswfO=yPb-FE2ad(ic_LYuhnct^{d`~U
z(C9%&1BT&e)T{f6S{noAiwweC)DM+lC01%o(F8A`KDg77i(PTvUMkX)@h7N7{02v0
z3%+Gu)H2${tt&Vv-<NkQMaJPb9FP7&_irdd-B20!#XaUpvj+7Eo}ixiJ?aU+V>us6
zEOHw;S4?s8W>;|l<1g2^4Yi^7kAavHS9Fo<MW!%eEb5i-!eqRGy08KDZ}S%?W6lOw
zT>CMb_zI?ABWkgQmb!e2$Yn|yYO&X$=6hGl{Re3Lq2mfW9$)4Xe%vI&vq{iqmuL~{
zf=#GTa11q3jg8lvUrZ@?2Z}|VKM99pA?n7Cp#B{%m3uDnLz~!$2@G`DgoG{bf1iU|
z3oDQdlY_{9r4s#k6w|N<b-dC1WPUN5QEQ?F!?3fr)iokaznOu-ObDPZm}l`i8{dZE
z^jDat%&X=-?9KRd^Mm;VbzRUlrx!&dgpT3Z9mk-4IL9W;K|N`qS&X5?Yq2ZtKrO<(
zsOwIk=DT2VHFhDsi~8aFs5SKpS>I3EX++S`WxF#5H9>N1R>;xORZpkR?3OwxEj>GZ
ZTvc=+o_1<h_UNpt$$?e1Hv$(^{{!+R=vV*%

diff --git a/po/en_AU.po b/po/en_AU.po
index 9cc3f67..64ff7e3 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
diff --git a/po/en_CA.gmo b/po/en_CA.gmo
index dfbfffd22b0c633ea6466aeecb8773b46fdf2c97..092e11e4c22bef00c4a2c6350f376410eead9b64 100644
GIT binary patch
delta 1785
zcmXZce@xVM7{Kud6`bM$f|X(91yO*UeecvbPG$t6;g8N>Y`K6Y>n4ZeI27Gvx^HXM
zwA@s%<{$h4!*VX$DmK%kKXPp`Hfy!9Wo_B|hud6a!>z>GdO!O-8|?LYK0luC=jUC^
zWKCzXKD(Ubk7S9AH;Akfk@~G7h1iCVVmB6`Z}n%eh<M!MFEKzojrsVqnZZYh|HTr_
zYZ6(D)u{0<)c!q9;!7@tK`PXDQ4<c~V>pUBv8%WeZ=z1%Ha>y#sEG=;xrqkxapEx6
z<4!z=r*I6HZFl27LH=ZFyDw5sq2MKvCHOq9$IV!UJ*Xf00N3Cb_!NF`^>^_Z;y|;=
zv$zqpe>-aZQPlpUs4KsLx)Z<SIuw708&Hkf(2S*+L|w@#jNr#uhPNz!h?>CL$+luU
zZoreM{lCUayo)-nco+Y;1sCI9)9<jtJ~Lq^&0e$LJdBG-a1`~7kD(sXka^LZM4ix&
z_%vqk7Fmr|s7Ka_?36F9R*^=%d~c$j^)OcBM;OMRunw2JEW&Zhi>NC-fx2_o&0kUT
zJit86i;L7?3D#m8Zp71A#`oo03d^a;U_Q>HZr$QN?rwxINZgA0p#gjc&uPr1DSm~E
z%bv#C+~xe{Rgo36&!Ar7Kd=fHaE5;6dqwULKWJy6d|zfeM51^fH)EvJy@nL(ga&an
zzGse`lc+~9gSz57s4M&r(|joUx|_(QE-oi$b_JiL{kJ#VgdU>5Ktn~sUAnSvwv`Us
zP`CU9hVU!Yff>|ivotC40>-fnPh$)xa6QhUUbd1RmoJKJstlsOj%n0<vpwv8BZZs;
zA{UtP4%CEyr9?PBDe7~Hx=;rkM?HcO)I^ike#^XP=BM3)s!;py#tQ63o!Ez{&++rL
z?-KuD9p|u=hP-~)A&mO&<EXzA2apYuv&ekq9O{J6V;Cn<+vm)`&3ooQsCQxk^RduB
z=nAD~#B9J^I<%k;=(PBVwZDZcsUI>gm{-gxETsJx^G{O_xp76NUrr%F#~NIQO{gD^
zTZh+BSK4d#qdu#{n1gSlUc&cL$Bm)p`_$s=m`(g0>V$8i-l^Nj_+kkRxM#D<tUygr
zH&GinxhXr8KA4CM-)LxlZbQ(kjd|g9VbAlH?}>+65=WAUl6|Sr)_ntsSTN#+YeL?p
hP=tQbm=_(6HFmBD)>WkX2D+1}{gqoL&Nq&E{{y<R^$7p~

delta 1738
zcmXZbYfR5k7{KwT+!iWbNaa#OMEna=vFJikk&P+KWz<$!Ma*@6a-DgR6=vpzTt{AH
zZLAGrvqhWC3))N=8zHl~%}n?{JJ0stKIb`?=bYa;&%eFfueIB+`C5PPsGrFBOp$OA
znVKyUirF{}m*Wtuw0;l6i0duBgn`7Z7>sRZCk`ckk0Y@cM`QFn7tcbSUp!Ad8APLk
z4s|PP!di^LI@E(*#t^)PdVmfbfp1U~{X;!y@O+U-jKR5>hP!bWHsUYTb*FPg_{q&2
zPh=d8e?)z8T&~CzOuz&zMqO|Kqp=ZV@wWB9!tum^FdpL;xcPag{pG0h>rijvI_gb4
z#!2|aqoEr_FLVPbIEJ_g^-FePGM>OVd|+`8YJ$;uB9k!>r{Q+g`PXnFzCv9WkS`L2
ziP#5oO)uXXh2~PT$Sg6}n5F1Xf^yV1-hlc<wdP5)3H3mCaV&nv;TT!qo-7&pa8EL=
zV>N2=RiVE1KAeolF$wSCZ2X2iqxcrNFWrWErB}^%)I1+C2zzlR4qhyhirF|F_h20R
zOAC#GbaY}czCpdZuc);#qL6~ZOw^6m;X&N5F+~%wMC1^6I&qmR&gLREWBfj95kJ8M
z{D4oH7hWv#iTGm)AIkpnY^6vFcH=CJUFH4_D^U+rfx~f!S#LI>KEZv|FMf{tg`csS
zjpA3kgPdARn>V|NqZofw>JHR{-fspX%3RTfmWyOCVFv1zZ^J~qg1WF1^>6bN=U{q;
zE3Q45MtlyZU>9n!4PNi^#Uqy~6{yADikk1)dhS1q#t%9!aN^VrF5$~c5uQ!_t6ZWb
zs0%itKEYAcL`^pSz<g`|#W9RWR=fGLaRPA(>cI}8{vFR&bN`z7j!o=BUD#_AVm7(|
zeL89_tUxYI_9Ew%{TPRbF$tSc$Ggne=3Da}YE68=VD$4gyGDo^YbN0!CS;&4D6qK9
z#y4RI{k3L;dC|Oyp^QH?UzlG|*ZJ2ty>J?Vbd1LUoQ}G2x=mP!`lTi28Vn*X#r{}>
zT7)}M*BwL6cgEtY*pK)I>c+QFYpMfTA0>ZigwfGwi!%Z>!K9Ydz#}sn+A<dm@Wmu0
arzNK}L}bNk+n46^HO$Fc)p8}P(f1$0_UV%V

diff --git a/po/en_CA.po b/po/en_CA.po
index 2bd88a0..b3a5a15 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index c084f83cad441066027841e7963cb0670fd8cc50..18b8b4cd5203874beda2703f492ac9f5dcb74902 100644
GIT binary patch
delta 1785
zcmXZcYi!MT7{KwTXk+v^Ywe;G)po0D5C7Auw#U5}6e}7_7#$Xko~~;TJw!wNBjTQ*
z>lQD(a2F9TY+@JPi?L+V1R)_V3F3_kijcT8gzuBzlbq!9dw!Sacm1Eg9wu}?OgMEi
z$={bCa=1+7GZC3wA(D#o@e5pmpW+6q-;D!_4_W*N28cT`h&RkG{G9kT4#hyF$Z*U<
zjc1|uk5-B={VB9kp>9S^*oI%?e$<8ii79vybpdxV9bcd(3Qlti9gb<l9!|lTxE^=n
zLF_x-jXQz-<id1c<SPon86thK2uEWCM`09oqF-<b{)Qv)lGQ)MuZfeZL~^hYwf`d2
z`n9P2_oMFo9O_Bj!#w=pQ_ul<GhM?B%p|Ty-N{ZYz@wOjH!XgLnqbT<k$hZ)g}4p1
z|38?E&rrvu%@!Gq6R|fgF#W|=SZXde>&-?pX2!7>3D%<C@jBEiYBP_S9jFVsg4x*T
z8<9bni+W{c$i{uCv5IEY$LFKo_0O1(M=*?6aRT<P7U4Q&3hGX`q8{m4^EPUp9vpyy
zIU>cFj-@ys$Ko!`Vt)CLLO&|HFo-WukFM8T_crn|gSZBDq88kY?HcoF(&mY5;Y>@v
zb&vDk1-u8^uc1ET`#1{U;&u9EFBEx9+_RXCGQT{i6)C|tI3B~_yRYFV)CINTAlz;q
zGCNSO;2P?VAEEB>J;s=*c!^uc@gI1c+}Rl%M*E%RZb9$R@1Y^5&ON%!dXcGgs6;*T
ztr)_;Q3rORel|%_{wuH=vv3zi@OK=I-KdW(y}{)xMh;b4Q6GCJYQ6^zoPRlm#2>k5
zR$PUe@M#mtF}2wxT827cJ?a(gLrv6S?KjPr=75;nP%di!**Fp#Q5W_r>gRYW=DWm~
ztz$Q4(hykbI(VqxeKqR;L<4eQvIkkOw4*L~FNU!LwY}SXZoV{Mp}vW?7{nBRl`D)e
z!{$`%PltJ^18OZ^ZS5N|h59!0uzAM3fT^_KGM|_qP{*aVIQ?u20V>AfCs=_xakX{$
z4t1xEW(@VSienOPLVbigP{$oW&3Dq`vzSQyKkCF6QQy>EWc*-Bj=RrhpqYc3VEpOQ
z!1kiVP;6CQLHqf#sxgHbUTMS&=Y>7b>o<2!sHSdBv?bcy6slMjuZv_9c;VuZR}?Cs
fUrEF(X^)iGCTC0-+0-1bk2bByopgF{`9bd^9e(yP

delta 1738
zcmXZbYiN#P7{KxCbsV$JjF~y?Jk0QJ$c)9jW;TaSVp|(4hs=aI<P@Gc79WU_<O9oy
zQDj-G5v7bmzHB8!R+uK`lw#z6bzk+=@4oKy;d-8Q`kFd@w{G<Dj`>6`%@!FfA`|9_
z48j0L;xZhF8?1gGMi8I0_%enNH(?k)GTU$n@dq4<-57(>IWEpb?O&WDo&-~<phDe-
zI$<>q#p9?OyMp1^jJknmI0E0HPV^6TqoH#}hG7iO!fCh%cVjL7LLGN5SA<U*b3KtH
z3jc_DVd6Y)0motr7NZV0h{N$B#^GJ7e}l=ye{eL$=ehp*sP$`6`yWTWiCd^Q@f^qD
z7mtE25S{NDreZvC5$Z{HV>+J31Z=Um3w44~^F>lIA1C1s)c)6TEWSY<7qoyiFco`Z
zuIbIULV>x&EHX>Ya&r~-V1l)%Z(ND`MAhaQvmSLr_c0N_V-!X$bWfIs9Nd#^t5|`W
zd>c{UdOxOO4W{7(oPpnvXOxMH+)1~iUg<US3F<tbFciCSDh3yj4;aA7xEB*xUv5+A
zPemJs;XBl;`-++y!wW@XF&lNEm3SBrXiU-sEfzV#osL=RlJjP<$N<_Oq9*YROu<fU
zrC&seNEh*^G7if6(z;wE13%()j9uaWhBDL*RbUkEG*6oKs88?^^~5hxPxu+DSSY#N
zZRG4ql9M;9!%?(9UF|m1h2C!(BG<U23$NgmbeN2K<=b&QUPT?)hWgw5#F?12&L!7g
z%p|VG3D}OBY{8XozGUPwr2;kCn^5O#t>pd#6n;=q$Br}By9r-!6ye##x5-UZh&o_B
z>JuD8ov7a0Tg(pgFUHdzRpt6m$1%jEs2e+k`a52z;{J8wd)BcXbzrx3h}rD^`z+L4
zC_yevJY>Ie02A;CreQs5d%OA8>@eS>=0qokp?F(dVW1gn`Z1XHS*QaRSiIWWt1z7U
zYV(v?XEx#>+8>**%rB_pd|RDf1ceYPlCU36LR~n^I^?0AwA3ueP~uhC2e+Um;V#s1
zCs5}*Z}BzkO?(G+;bzpFdWMXTmOm6CsOYiH8HqYUO2f2}qf=^HX6N<w$EKxcrf1X)
V4a8~LpXvA4%nU4VxEiSS{|Df}=)C{{

diff --git a/po/en_GB.po b/po/en_GB.po
index 806e7c6..1972747 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
diff --git a/po/en_US.gmo b/po/en_US.gmo
index 129e4f0d043acebfa7ad09a1b5267583fe72774c..ac526b5785595a7c1cef60f21a85998bf34f0fed 100644
GIT binary patch
delta 1790
zcmXZbdu+{T7{KwTGgZB;t94l2PSvXIaq4$UqdmpU(W*<;R+oueMyp!MIi1rqVUwTB
zCSyuO_@g1%?GLG7RsPtrYzPu!2@#j<4@B0cNt1<{Ofr0*yif8=KJW8hp7;7Y*_(8+
zH|ca|vVSN^<hz+7*&-5|B{BqSaVW0Aw{erz@5XnCk63&LGl(x?Cf+n3;k(37a1^Fg
zij2X0)VK<@e|@F+l18DG3Uw=L!aX<)J5U$)6K3HR)CJtbk=T!#D7DHhGzZ@!4&n@~
z#4m6s9>)Q*-MAl+PcF>%Mc${7S}pP>dRUC5ScLVc6Yawh*onD#)$02&pLoz5k?~lJ
z+J6aZeFC+A2kOp$K|P847{nJo1s#w-*EK|OEb&^@o$SOCJcfCA%i`y#35w>4Ou!{L
z33s6OKaYjjhdM5MzDN$1;Q*{N{iRk|Zmu@hnvLcLGmdYNAc1<vZKzkY$2@MHLtW4{
z9EY!PIF74vS2hjVxGyzU(Tw`|HlyBkJ5Io(7{=>36<;FPDHRLcPPd~TX}5VBHP17A
z3sY)Err<Cv$6B0>yD*RW<yQ)+R6N2=>_<Ji|54w@_=O??tU;Y9hF{@cjd?WLA8}2b
z>Ey-kasK>?NILC*pg!V1u?YXc+w>c=jB6o&wt|f^zdTsUz2Fn9z~CzPH#DLyD1pOq
zhk4lSM!kX?s5^d)y2Iz#!bIWKZXw^UVH4chDI87voqD&Rf6;$ILvDk6bR*Y`d`O26
zP>*~YhOi5D;6v2kMw;jY)tHB0V+1>~7<*73+t6m0FN_?fBv2pwMbvx`nmPX{g;!L3
z&x)fPT*BU%2-hd+ahGU0>VP)XD>#UnsN33an*C-<i`!5hYX2%Mz;&n#+lTr)o@nu1
z;;YuN2glMd=rh-$2=%|OMtuwQ$brdjWWCakdII|~jNPd1J!YTTZ~l$?CZ1v@ruiFP
zVT2hpD=>`?^H2vYwK#6=pJNvF-<U_tQ|9kDg!WtJU*><P<I)pOe>8;*Dm)yF(@`g`
zwhoI>ce>7OM*Xc~n2cLcAK{m%<2q3D{b=!797y~d>cp2(-_%`Xe2yfyy5A<l%tcL5
z+Et#ht8`$fWn)9hfeSO|Oq>+($|GJl81_6bbzyDj<A%1TL{mH#n)PXGLnKh*g{OqP
n(ohNg$|7Fbfk?D2D^Rewt}rmQAQo?3-xO;soZi(QJ?6azzK!;$

delta 1738
zcmXZcduYyK6u|K_W-hZE8?#}ynd`>87wzJ<nPJ#WsI9yR3v+uhmqq>jG2~Lzq~x-#
zA+gCNqDU@LNTz8ew?!GHST5xc`JSFrZ+)KgT+Z+LJ<s{Q4?04cJ3=lug?YO}L>i}w
z#EQt!=^}kF2m9e%jK&q#Uxj^%_gQ=bBZx0y6y7$UVI1)r9E6>igwcgA_My%%DHKn_
zX)K{btwc?@4f|sa>c&oD3|>LqzylnJZK#QUqHZ*FhR6Vn!#o^|yD*3i_ziX4;h7@*
zq-mxnl1AevQ79(N5*dR@I0{Qp7gS>+9>Zk3YW=M^jQ9r*$M_;QKM%D(fI7bh^(4-r
zp2R~Ojh{Rk`he)!ZXg3wh>KC*B#3@IfT?)L;&#*ov2#SyF%QS#der$1I1*b?*Zso;
zOqnav6(^fszBLNXBD2_>Z!R*+u?q<TsCT>!^@_Hc2hDoa4PD2f_yyxJve;eOaOA~3
z$+C`xsKvJu^{%&LI_}3zyn&Oj1Gz>?D{*hS4)sXu%)6+0-eV+oVitzXqp&dt$Kw`E
z<@s`+MlU*^VHCEZ9^Gfu+K4F?8G>1;4=TewxI<%#<{$3mOb0J=#d)?&q&MTYP>c8x
zj>32Nig`WDMZOZhUrcVEFHZs@+4u%0V%!q<HOxodPypj`y}8${L%o8VsBion^$puG
z$b%A>x{VxKPH}Q)$8j*@_g1<MeL(Lo1K|~}=)zWu<TGI;>XEO-3_OLp@G0tN^A)F}
ze~l}y&6rDk498##YOzVB%a@28rUX!ny%{y%lS<CNfW{X(&amT*wJzby4Sag^|3*zz
zxX~?GhI$1aYN9&S@!Mvb*@-FiM+Dt`AC4d{MV()b`Z*pAa{juLt2VI(b>R=25WC5J
z_kPq`C_xTPs*wH4c1*>cn2B|$<1J>Z*=D{*t%<i7g}*#&bldDY;><J*XTk*31^E`2
z+js@W(7)B(XC5~%Vjsrum@mwasOx^4UXLyAFE;^uGB5)5!G6?<Q&8Wu)Le*>#AO(U
zt5Az@1M0dOjKCunpT=&)7f|zEMy;v)$od5NPNOd!f6VYImmuj{PQ?BRwU4J2b@vU)
b^ym7sYx@@@YulIW^VLo*Sa7Yepx*Z%E$`+2

diff --git a/po/en_US.po b/po/en_US.po
index 35added..eb5e509 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
diff --git a/po/eo.gmo b/po/eo.gmo
index d7da721f8c9637b24b2df67419fe3a239d9bc3f5..a240dba798cfbf472e47a6e0874ebcc2f19513fd 100644
GIT binary patch
delta 1732
zcmXZbduWeg6u|MbnN7Qy%`QJ?esgErZ@;-@HjLjc%-kcF*rqXtn9U`kmzJ5#B^qid
zB_TChh7u`6%H&f1U<yh7NdAz^BH!aZe|?^F-uHRl^E}UaUj;+n1VgTz3wJJth-?gq
z^c4|Lkw`N7Fa=964l6JbYcUBM?fGepA?`qZ@1DgkQQv=$9{hzvFrio^4Rf&%E-DsB
zq8ZeXh{dhg8~0*=Y(XvPDkk6~)QNBG`B#i2jw*5UNvQKiU?CP^12*A#jGpGM*N!uZ
zA5U}K%2K9_gprtp85qD!+<>Xrin@~<s5^OvgYXBAz<#A7*;t5!u^va_3H0J!9Dwg|
zAj%ApQQ&nL=z}uUg==s)9>R3&Kp(!cd_<XupEw(}&`Q)on=uD(T0V%nPBPon4;ElQ
ztiVv*VLH2Pu-j}f8_oS@vw7G&YPOgs%~taaYT;*5H}({@r@mu6#?Jb`aYxb_=$#j!
z-t8RJyIz4AxCO`HS)7V5ku@ZFw!7n%s7-a;yoNge1?qaAun2!6w<QI0Xl!i4Ec#D6
z8AOx#gRvMn*S%X0>J>~xy`pl|9qhyd*n-2ucxRr-sU9Mw3*BD%xY%8<#}fC*<4}7f
z1HbUz0{lrFSk6iCeaSBu8IQ9u4;xVnx{Go61huQ*n%%gLIJrV(4K`pJeny=iRY{%?
zm7uQERwc5GOTUG>Ay2j2eEI04@?tduJ?e%U_lVmtpZFVQV%A!bVYn1aa1ZK{K146Z
zP)#oS(1)vWC>}@tP`QOOFm%0pg0s*|T)m$2=U0?{ByLbhCk`fVs^v8BGJ3EZwerMG
zZa0rdJ&{GI&+Act(}Sp8ehIaJ`<4%)UO}%q_x&8y-?yxe^VfwpkkAQ7%nsBeeT}+s
zx8+mn-QQ<2Qm;(KEG)Ksy}8xgj<ksEL@jg=#$c;?(P5xXcij>Xus87w)CnIf{%g-;
zH@jV(YWmD6=6sB2-bzfsZ5AIu{qPy=gO{-{I=2}_GI);B*oFE+5Vi6@7=fW%Xe^9G
zjgv4D(@+Z@YZjqyXaR;}73#Wc(U03Ke*u{nFKzBX?x0rK**-F6)wrHnwRNjTA3GE%
bjTqzgPssD<9P0|C>o_;hpW7Z@_-yn)e(2))

delta 1726
zcmXZcX-HK;6u|LgnU-7nv~01mY<sEsw9Q_tW}3EGLC|itkrk#^6cpafXeF=&N$6Wv
zAQ72C3qeH@WVBEpTA(5XgDi+BF{0>yn)BiDn>qK++%q$0-n-6_*PS6(n!>!M5Ro0Z
zA_>ATPb3ljH~@1n7FS|F+=l(J#-5+SX!<Rv@7=NfbJX|W<3Rj@BQa*K$WWYsakzA@
zcoIcpBY_yK#J+d{2V)&-LYFWeAD|9=ZO=br1pTml7mq_7mx6O}7S>`dUcm4IH{WGk
zK>uNZ=Q4|*ClX2^8&h!xrePT-VFT()T2WW>1V`X^9E<%5MKW+EreHbx@iZpmZ5)E{
za2Wo^aX8p3au4!RC*Fu-@E8uq795W+E#70kNPzx0)I?XICVB)j@tVauQ0MWnO#NUG
z2jNQWfxAs_uQm3W)n<)($UI^mH&2>%X1&>9Hlike7Ik5dQETcO`moQ!{|omdiH4qe
z5cO<}P|tcbreXz7z_XZx&yhLAx5%xy1huG6nO9K9KSQ0b9rN%fa#|8B7NH!Z7SpLe
zX`>NEpc`Yb*J5|J38+Uf1@-J!psrvKp1?XB6H0w7A-SG>WSOg#kIUVBe^IwQa)qmr
z(fF13im{vcj5RER@5|)1d;|+Ih&8AQ-Nsmagj&^a%`V(V-&Z2C1*>r=enK4|wvIR-
z%0Zo{c>}x2p<hQ`P{L+ce3Q{j;>A)Ly4BTXZi}078vQSrhGVyijK*b{kNZ)#^gbqI
zZ?efoKaR)sI0{c8H&m`;5&ppeIB&ZfSGt}3=PJrU0yjvc4O8gXR)}z1auM~~b)jY+
zTj{Df3w1}9qCPK2y{1P|xBNV60(ULmfqG4QR=M}nP_J)(75lFfml4nbC(IVqEq#SL
zahJv8ce?8{70FkoV>-^Zc)3|=?m|jL_Mj%ZAEU9sZ1QMm(OtE`J?u;W8R~!!*8gSC
z`|NU6ooM>aY34%oF|GvTvC8^~Q9s;>ad;6E(7Q<^g2q#f!Z)Zdbf9M5jp6tQBeB<R
z*N;Q}j~|GdaE3VxbwR}#hHFvh-Gl+GviLb<oKKovLvEpF*w*Tg-ZZJcKDRJDkerzn
V%*w8B&mFGqKrk?|HFD02tbe3U;WhvO

diff --git a/po/eo.po b/po/eo.po
index 6502aba..335e636 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index 6c8de2f84073ee8f4e3ecf6e2ca679b94a4961a0..4b372a909010a01eb7f9f9cf5c07b5749b5efbca 100644
GIT binary patch
delta 1732
zcmXZcdrZw?7{Kx8pmHhYUT)o7lBE+4Da5Jda@@)cn_H$VR7h^|8)KNrYB4jjSsVY@
znu9i%Kg?XV{_qdl82{K9n}yAoWB5MaXFK(IpZ9&A-~0aF_c`b2SKrC6zV^0g?}ksL
zCMYsUMAC{xhTt?z!Vo561r9^c#?RaMbsR|l6Y~`gApVT$_!mcEda+0<&NVk-Jn^w&
z@%|^Y(h*0;RZPHJn2e8c1inYzV2^n&aVU-@9)~(VggU+!b)g-|M_TxI9ADvGEH4om
zjicv_l;W)Up2%bxXX)sL4>1Ry;zay~DL8Hce^`S0X4N<bn{g6$pys_t-9X|(m!F5a
z(F)YOM%3rDV=i`iH1tgq7IFOOM@=Y0P1uK7cnPzy6ALhcnV27P3ss<Qq!|PF05$Ii
z>VjhziwwsQ_P|QhtFp#+v)0^Y)|>mx2Gc{WjU%YFanTH$o#?0k9qLI9UgGA@K)w4?
z97#z@xpjD`#ngmaL{~5aZ=zn&8|3;VVW|ioS;ar?zlJIJ+Wd|BoKed}`lBE9s0%P3
z_hKI2#4)Td-8A~rF?hM#Su*O5vr(^N1!~dkN3G@y*n}OJLD7_yQfNIzYFF|M`g^T$
z3n!r-c?SBi5L207hY{j)>v&Ptm*({%#n^__n|#7poU*}H_Z%ERyc|#ACTzrRJb?`x
z-9l02A~T6o@E#jli}A$6D@0au>6w^De0Ynii8k~COzfnQ!GLd@2!|n=I28|II<}k7
zF-ZIqXJh_$cT)SYkoYoc@x4RMOR5$r!db{6$r02Od4XD#U#dC(G8)5bC?Gbn74^tt
zcDXywLM^U?s8`a8`g?H4e2Mx)^$qoEV(Z-eOdL-fMEyEep?+H$ZM*}MiJ#SZuF-8B
z@w;7|Z7xN9a1H9lP9rBNVT{JxI34d>|9A7J88QE$zPYd7UFk^FE6wt(qrhB-TD==l
z6Y4B(vhgdZiDC1R*=2sjL5xRGpA)~wnTDDdFiS9w*jr7bH;qc{hqX8a8<1j^W{kq~
zsKs;%WAHlayj!Swoi^Tux`7Ya2P3E(iP}p+V<PIwg^+mzrOY*?5_Lxh!V}^)2coiS
icW$2CawfPSW=e{GMxH;X<!vxk+qrrE+;DW^p};><x8<P#

delta 1726
zcmXZcduYvJ7{KvoZeugMht1g8g<}h6<IFm4b(k~EToYn!HDPRNH!bt?hnm~mCW)l*
z$4X`<rARKdKm3Cg`AfN#CgqaJExwQUsnhwq&-1?T?|pyo`<!#|bJYINQQen^c~_%E
z>cS$)B9gH{BozyAEJkn)R^n)EvHp|R--$`&ADGWDk@!7k<4?@M@g*WYoNZQMJn_B~
z@%~RZP9l!PMNGhMoPhT+9bcht@DJ+5#DyZc=tCVJLG53Qy3h{fBS-ma!)JIKH%8bD
zjx7~giN&R!NFj~GB!=K!EWn4DkKZs8eTzgUVi@(!wqXvo<5cWHo%afL1Idfs{2=N^
zD^cgQp+4sd7Gs}BL*F!ZiAWaaqfRJCozQ?&@C;7FUYv&mn1@AWZlOxljkIGB@1V~6
zg1TVlQjs)_;2^9ry=rT0HEYaTbC=m*Hk&P|wb6=N8>h`Kvlj#8U!tB=e7PGx1N91*
z;yB^{H(H_vwU`c}7SVb1<2BSPdVyS@#4Z!zBdhq*{3Xo9=jM0R=Zsk{G79rik2-|2
zupUEr4Rcsu`f0?Fh+pA$mWI0HJk+aLhFUa@sMUN5k6{n`DVp#~k&eM4HETpt$p2mE
z7EW33jyxL!<maM~@pbr%_(TOS%KFm2Nu&fXAoV8ia3oIM?5cYfCK8w7VXVL-*pCOW
zxza5pRs6(=)A0@)T8r_-sar(WaOt_2MZ9OLtBDKf1sT{&!%xTW8W9dda(9T#z$Vlp
zykb7aF!5KMi$y!#Nj2hp;<Kp5_Y!qpO0CEOEJhAVS}_fupcdtaTF!qJjifq}b8KV_
z>X8qscX#YZEw0_DS8^Qn|KO(i6!nklBkI*eH@NY+IEi=;>d&zn_1Ds7{XIB=_)&xB
z8vT}tX>@U(xfu1q+fg@m069tN!eMwFXW}i(e=@(C1LhCZH~)<ZIJ(JQso$faiIBMj
zwR$(8PN=i^koBKOt%WZ0p4n%<#bo*iP@fai?94!&7cj#ZN9?VpF`Pyf#$pYoVlz^#
z(vCy%Bx*68!D#G69oLOIuh;tfP&e=zN8kYJMr60hbVx=$xd<{YNy=SAs!(^-bYpT{
gb+Dr&yeK-5Sx^`%Ebe#{_Gvp13KZRloxeBu4^M^T-~a#s

diff --git a/po/fi.po b/po/fi.po
index 444c762..2146b70 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index e3eee64557e74551a80d5db8fbe1ca3d5fa5650a..b9da4525111a230679244ed9fb01f0366011dbd5 100644
GIT binary patch
delta 4320
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

delta 4264
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
Zmn^NREHBP>JJ7Z?H<|zCPMTR@{sWjRpVj~X

diff --git a/po/fr.po b/po/fr.po
index f069d01..07f580e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:20+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/po/hr.gmo b/po/hr.gmo
index 20bd12562d10535d1d3af4a8523bd3a628daa88c..07aa57ed072402af27d6a577ae8b10757d4a667e 100644
GIT binary patch
delta 1732
zcmXZcdrXf}7{Ku-x|pO?R2ID@m*PhkB@C%ZD7lQ4QBsVU6d~gsYc?V#n_0}(V%box
zTjLMrvT4IKbNMH2Esbd-Hf)&hvvdCXJkL4jeb0HH^Zb6N`@PQgd$l$Dx}Uv7c4UZz
zi%4OXNElXO1lD07UP7I}gQM_;&3o<qKMZDk_yUnoj7EJ=D#l_S>ho1N4v(Y0w{3yA
zGJ@a%0|D5HLD-F>@f+%c!xowi#-nbKhGQ@nM`AhZdk&$44ahgiZ9IrSu@S4Y&B1~f
ziPVzEFLFiV2wEBN#`l<lT{s0pb3|frK1O0GI(P`9u?Z*RW1NOxaRNGvMG`O@_4&Q%
zV580NV-ooXmtZVG@Dh=Un27OMfKgbB9&AQ^aVI9@Z;V6FQnP*yrjj2<oo~mf*pFKB
z$Xrv=bR0~+*6J47V54=jwcNVHT4mjXgLuJy)GIiMTAB0KcIz9|3VcWHf!I8Al{u)r
zQG$+e|1|`9ca3(zHPjw>Y8J>_)YAS!z0*m{jOD1~*HJ6jW&MlV6Os8eBqrf(oR4$x
zfX(lr!~XJ<z@Lfm<)*n}QA<A)9V|foHPoOs<rzGHt=LN~Ju5`cVaRH;@wEce%#SdH
zb+1sbsuv%!F0fFfPsi7>p8chLy+}H~#7qn-G6!0Pf#k&)ffcA<dJNf9uHZ`igSt_E
zvH8MMtY)Jo9L9J=smMI;YyxTzZQ4W?@dUcxn7B(2%|Oc*5#A*oI344+nma5)hx`<l
z;0-Lp&~nq=HK@&Z0jJ<=)c*;uZIm6uaS0Y;3|>Y(z_V@CKZ{_1f#;lf#&&ZMpPeEb
z8J~#y`>#U>n^6z?#E$o&ZX}iF%ED0B&p`dsd^^4ewF%FnR`Nb-^S-Hc&53^4iLfg3
zf<)9(FGlU|EjS*JAO(}F)>ib8-?VwRwa5C=`U$mnzMyu$-!60TDAxw5)?Cy(FGYP|
zm(5Sw`HL9B_+4v<waYqyBbfKyZ45_UA8+%y)_l~;xg`Wc2=<{r9!CAy)T1|EKp$+v
zAZ$TjY)Ac)2RIbpp+47xdVm4cb>7uxoj<0Mk3$_VL=F}#8%!X(F@TAqx8efIQhYoW
im1Ri{^%*&S$xgz|SqX^^T^Z3Dr_D-8yXBjCJo!IB*6Eo5

delta 1726
zcmXZcdrZzz7{KwTP{`ZuMehBI7g5xky9_Bxu8~b7mugdlsIkd!HgX-CHo{u0HiXGE
z{%AuRe=yBl{)x?8$HvQCHjIt$vvdCXJm)#*_dDnJoacQ{1cHtQf?AqF+;>4Do6<%4
ziAY|CNDP)^f2_d>JcBylf_?Fx9lx~mzcHG8k4%x?I0*GUDL4$XQJ*izp|}tAy%#gZ
zl_-KX5+3ZpNPLb1@Du8Tp|i~f4(bM}I2g0A50;?5XD2#%1o<Ypg1hh=p2jV6%)vZa
zB6}G7vRsh_f@Tt3@hOhSPE5pzY>{|O!$DYx4(`M_tjE!K3&-L|9F7C$iX>w?>hoLC
z!Q*y(1O1GjxdcN9JUJpGFcC-LQjA3xldu8x#T}T6KQIAD&NJ(CaRTFN)cIB%gC9^!
z9y8xmbSidXyv*w6+hCP-t+m8jYAv@`U@$MJLcM|=sFgWkZM8l^t-xp09*A9Ft}+9)
zHww_<`=pXU@9wx=a2~Y>+RXxaj9S|7sCPPap|J!te*v|Eoz`EdJrT1=Bpj1)DyHEy
z+-}F$(P4l2Mi9n?cd==%Sk%&wLkE|l{u(M#oAM}DV>7;^mLqdTPGa~nv+?=mrkQV|
zmvs+Nuj(bXv#w{p$a~Efu%7*;b(P2rypOXmtk4{2Ax1D>f&H-z^-K36drA{7!Jnub
z<*YVeScp|@RFA#L_bw8d&Yi`f_RyLV4vqWK{mR5uf;bY5>*;X3i{sE&YVI%}9ma=n
zEndQ6j3_hRU5VO!b(n|`QU53Y;!N~z;Bc6S@pu;X0CzS}{|tfvi4IQe-)IgZTSV58
zk4OFe*Pw$9s0Y1m^RH1i`h&3;U18SyQNJ_?HD7_+gvU@Tc>}e1A62;KL|^Pg^j7nN
zMATAeqIP!?`fxW=Fga&!#w5m<?fAL%h4q#7Eo$$)NA3RLZRX$uTpOfVvrzB65cPpg
zc6`vzpF%JBtJb^LPHO<8m=CHndQsQ=?0B*@2eoo;0YP_yZ5W2ts6U$n*cI!r8`fha
zHev|2qJBvm_QWTs&%HoBKmc{!Kh$+0Ri;OVpyu<CgGI|q6Ub)tFtO)af~R<VZEbpX
bXtI;ypW>fX`zAe3<K!vH6R(BMI-L3+a#rTr

diff --git a/po/hr.po b/po/hr.po
index 17a01a0..b8f18f5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index 90ff51dcb85d77b1ac7f8644e2f6f4eb2c17be5b..737417f1c3cd30e5f04399283e6b8549235817bf 100644
GIT binary patch
delta 3974
zcmXxmdvKK18OQOnB;at_+#rbwtl6*$7)SynTue4VNVpgzRW4fTz`#P57y=1wmLh4K
zm5w3U5wN_qI^JrqpeP`amQqvEG!_V=g2g`yQ;NzIiw#q2IzvIB-=FX4&YXPCIs3ln
zea>^vc{e9-c&^>_#4e`9KV$fOLK#8XH^7(-k1=Il^&0a^vN6N39aHcKreO~z;U(Mu
zH4dd6&qccKPX1_!v6zS@)+$V;y%>GQ#7rZVEIPKi9cDl3h7WKsUa($44fqYFqlc#{
zungqcrVtfCIe#>fMW}JsqXONG8MqV6aUZtueA7#%osQLvrW=P4-W<%sTwIUw_$-dW
z7jYDxKwW<g70_VPl8pgW|12DdD{wTn+W!5v{}lRozUif+$ObdYaLh&BFatGE9V$ax
zPy_BkUEhQG_=WvG=}xjhdpzp?Wq3EXVKE-WBD{>6SUQ7vHSkm_nYh%+>lcW{QQJz7
ze9HQ?^%vNW{^yWsn-@@vaL9VxdI9ywe_;;hFg#B+Rj5T-ftp&xws#=wYJQc;ifA<t
z)1kS&j}!1~EW-c^nvKg*b9oIlh4a=MsDUyWJpl`F3YK9BMsXq@zyN-MgYXXaq5@0N
zisVrlNr#d&5B(THJ;=dU>`<F+QF50tPmrp`tPC5;T;!%9_-|xg%x%=JNoULand>U>
zOWJ94YNEIC9!wr<Oc3YBsA%7BK}EC^mAYNlPU|_;67-^G97nn|!!&H*K@Xq;d3PMU
zfi*jg#A^CTrve&E`fkua4T;^9Ok&4jYzY;m{ADb_GpHMHq0WVGvN6*!j7s5dEX5ww
z_KPRqtd=Q84fq4RAD>3DZ7!k4`wlB{1k-<&fR`iV#Y}t|H}S>YsDU=3ZrF)hf<rh0
z&!WD+W*s=yZRen7G#z#Q3e-9Hsr~*<^wB<!8uv2ly0~e&FGdtpbir(7Kbab28O`H3
z5cl99Jc!CbCn{5a!&LN6cMafR+9jx^n1vd5f&G4+b&K^y8RLS(RJ1uxqHZ{E+t*PK
z7*y^??6;O%ms=l4zv1O=?XrH3dWXibE*d`>)efNc&;*R>JkO+})GkIv9<^@9blTfd
zn{yA|g-1~LeTr##)wVqq?lDY5jhBncR5=d72GlqktgRK~UlBb+$5$RU2I^StnCZUr
zUd55L-$C_XLM>6BHEEW+H}X+|RG|W1jtcNmR3O_>fxnJfcmg%<m02-26@z%o=msC^
zK}Dz=XJamgP%qgw)DpdgyzI<}sMB)=^|O<~k&$Cin>L8^@L~KV?#44%cCY)w^Tw)-
zd5DfuWIvgoV?3V0x%esSMd7Ex(Kky_Guevy_!^GJbErVR#mQKBpZj79V=?U=w%v`R
zX!oK{No*M5>A_P`ySoMT#Va@ld(e-4s25IZwK2R~%>AhQV#tX!$50Qxi5zuP#F<v$
zt5E^$!5ln~%It0Ir}Ll5+k%SmS^d_4b(A&Fnr|IvEkf;yNvMJ6Ti00IFrWTir~p1j
zy<z(>QRm<LfV);cOyrAF)If7l$0m#gxDnYmW;f2quW&I=rJ)Qwi`pyatT#}5$-lro
z6%&!wF_lO%&32r_^UVb+dO%>I`vRGdx^XFLDb}Nw=6TevJ%)b#40mC_Mf}&mrrC|X
zaZG}!l#%b2xD(1)>fWD+#q?L>BV4~3V>ukVt08x$i7VX*vyo*qYfu?^8&mKUDl>n@
zLcESj>F65wf1!D()HdKuY{MDx{21X7+6i^WtYxi-qmJQ|_2gfhY;QfU*Emv#%0z3U
z8%PI^qkRjtYYW%8yZS+#K|6+=DAR>wao~FQM`jXgb8bRq>?jh0xqu|alt<iS{8EJc
zYjbqc!77+9@fLvuo7`hny3v?b^sm4i>_I)~8Y<AtN8OCvi<<dL)NyP<J^0tC>rYs}
zv1V;@zrQa=C65alP;331wF@=ltEd5!o88S-VqJ#BX<CsCn<r5d*^VXHiDcUR$9mm*
z(|QZF1ToJ~+&5n~rqMCkT8;YgslgO%Mn7(|?E{!jy9+b%FR1(bFarm-xaQ(e+S5_v
zEVS)an5^^P>{iTEs8{gIsLj%WUVINVz(=SVe~$g}@0f`H#DVxNj=%wrxu+<A3S=B=
zB2}pCmZ1Wv!-+aqEmQ{3aR~LGqt?@?04_Os-mLzwQ~SiJ_GWp0>#X%=rM^d7J3ycP
zl%151op$dJJ^P&hdWU;|M_c)sLg{p}6M~)(ouvusc}HmLDf%p=yhG7e-a?s4(W3u|
z@`3YGLb2yv=WIfy?<3lWC~Xw&CLiU;6n%c<Oh`=ko^TuA|2^Y8m>BRJbT%c9_8z52
z+hGHx!`YuWC;NSB)f9bJxtP;9mGTzlZ6`G;knu<R%}V^4t#8F+&itf6!C7i=QpmXB
zo%8+Y4gMasb#27|e@;5>Nux7*Xdb8Nu<O%Bd5H2S=d+}-$-h?@p97TDl)a8GIp8_v
z%t#*Y>2{VTXL<h6@mTV>f{~%M;b2`uG#qJ)hS#hKMS{^tsHU!=HrPZZ8m`?G?093^
z<+%O@>muPIXM07}9mW3fC8gshI2S9jRlldSc#1Qi^78bD3o16$HkJApgx57jqJC~~
zXj&7B)-^Wx!;wg1q{$y`^hX~F`{#ukYBz*x!v%}Np|$={O-&@+)Ku8<kIMYX`K!Cz
squqP!gDacrh^Dr_`$%(Lus+Nc_2HWCy-jXd-Fs{6Lcxw<%@gDP2XNyXAOHXW

delta 3820
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

diff --git a/po/hu.po b/po/hu.po
index 2dde9c6..cf408d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:37+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 52ffb78a9fe32c6093722fc3201d68f59f42e482..597f824f9a1b5bceb4d77ee150eee7faa5613d90 100644
GIT binary patch
delta 1732
zcmXZcTS(S-9LMpmu1w0z$4t#?K878njOTgEW(irEnsyu%6x9-%Pzsu6hi%3GqBPbl
zqE;8pSWr|{P-%2C*6<>Tmb+<0CwCEbArY+;$aZ1xPya8duiy9g{~f-+lQ#yFZVe_~
zKc5m@NHS}wFv~Er?4@R-aRz2#0>@(wPQZ<Bt9uC5?u^Gh9^Xav8^9>O#ca&1GMkJ=
zn2yy|7JP2Fj*4+qY)2*X9Ztc+n2VP%6Z=pT{*4-F5Y;cG+AM<EsD3kX9#-Q%`~kag
z2$e`jjTv37yCxtT3eTw+foaRkiZOzPSdLNr7W1$JHNjc;HclgchU%AGYxX6^a5}EW
zeB6zb@RZwwMZ|vv6x3h{r($khIB^-OLp^HXeOQ2(J-&}Ki2uWxICZ&M9G9a8-j5pZ
zB2L76s0F;hWE^&b<P~AXNH^6T<EFb2H_Oez90tlmZE3=-b?b2s^?Oh|c>#5lf1-};
z1#*OeeW0Mr5Lp>snkecl=b=_!jbC9qvdeZA`LU1u(GFCu3Rl?VcA)Ocub7TKI3N44
z6o=gSY8@Tt-$-FJAC93q{DRuj%cuz+pw9Gv)S2e3G5ZOZU_O_o9}j+E_Iho&fVTB!
zWBJ~R+VY>V7_Z?S+6~}K;&Yowl=<z)&1PlTjf?ORreV%E;cF;FZFLFi*0027Y{Vvf
zjCyWWTf!A?z^hDj95qh)Ru;seufTlbT@B%-J&8ethQCqJW$E8$wiy4#IT+t=HXG|v
z-;dxDypHAg4)q!mjr`&ooP`Ha_1BOWXZ^SVv&dHU&8VI2YGVKEDBPrCFNqAJZu#C8
zGj_>NV=lhOD5mWQcc2*c52+5d@_N(`wYy!Y3C^PuzwhxI)Ob0q;drsuAk64%Ds+om
z+)mV1ok3;%J5Ix=NS>C|=C1~eh*LdIxFv3>TZVdui%^NLM<v`Gctxk%jk<(As7(7j
ze&XK;F@ySHH)CfQ7q|(G@Vyc<ah=E8a2)aX9v?={6LeD;Md1pL!CoAXe_%2`z!ZFl
zy43@y_ODR?ir=FyS!#PY-~?1$i0T(dB~*$Dtn>Q)VST0@^aiI;6I|*o8rx7ZvUo>Z
hL*m5IirP_gqp<}GWAPLJR1~OOx-hn&H>L7Q{1d$*;4uII

delta 1726
zcmXZcTS(S-9LMpm8A@uYkGZvVc(kLUPg9$&Y`C<{vXhWR!?iA&k=ACWH7~~g8byOP
zR!BXvLD3m1J0M7fcTw7n5w-GWcu^bGRvSpWkOg~x_Wy$V`h9=L@9*%p|3$*}7YWzS
zCIzPw%v!3<GR!P<g;@&D#;F*?EUdz8+~n?Z_oMptc--spZPd6C%)vkL9h_WkHUsD4
z6s)Ya;Qx+wRHRe!1uBttoQVf<8lJ%j4xkpikDBNiYFxrflE+NcxH<SCR^m6f55LDT
zR3e=<W(>7>O<<N!;a4gqV)80>jcGU+%P|MH;``W%THt5*Ce9;%f*SW0XJNr=v-wzy
zQEbKOc+~C1eByfn1$7w1*_c%uE?kBh(14owYs|%S9uMLI;y0LwGuN0E<4V-T9jN(E
z<9m1qwSiHbfa7lP)(f^aY)EvI+(~Ylo9;&NT_(y#9cj#6;Wpqx>i3{d@)YVS@1m}3
z6uH8{{-U7AkhU&-G}BRc`2lL@mG}|1Ag5~=kRSV-KRSVm_2CY;yPc@F@)J(MUM#}_
zT#RFG;RanD_uoh%g@(hZ0mo5CdJeU~FzQbKLEUL~9ewd*jPhuP@Ia#3^ZIZDUvB25
z)82(T@*gpV7x51LM({V{6Q7YN>)U}XW=k=S75EU-F!Fi$HAGQIU4(k|tMDsq#GUvE
z^|>wE8t$+jFSF1OsCmk_u^}$K2BXBg8^cF?1cOXE_EXSf8QQ@l_y;b;!X|#P0oDE;
zR^lc61Ye=PhFG&%39i8c{1#Pz5&7b52tUPivQ>Q(>SPb?<os(XT&1FeM8;9CysgEI
zQ?g??4PRppChrbUAP@BqsT#HO2Gj|)xQ9>+oJ1u)=<!R`e3900zJk^u%xEnYdd1Cd
z7wV{bP#NFAdH5K~)BeQ?XnVrXEfE#R+#+|8TZZ}!m!J~gh)TFA@QN-sj(UW>s7wbu
z{>9s$VFvZ%ZfaW?&v0XyNqYrGu+HOcm`=Rc<AbPmf;fd_3g<BuuV5D5LhWc6lkfrR
zRga+h|Bm`s{2KMh65GQGGf;69HLehq&>}3sYOn7I>mwF;hoh(k&h+I^ZY=HYu3DX3
blv7+%Ub49RX;m)eq9x^}#eJ#EFBSg>9)aC>

diff --git a/po/nb.po b/po/nb.po
index 04e146d..2dd1883 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index 7275510ab87f900e27f24faf4c59aaa2eb33c81c..afe129811fa2a981a2e7fcc43edcf18fce3b8e7d 100644
GIT binary patch
delta 1745
zcmXZdeMnVj9Ki8kl2(#rFIGCLyUMKW<hfT(@1^BS_d3hji)C*znl%d}G`*!XbcbAT
zV}sSS6&ckK#uBUB8`K{a_(x<^5V<#4<scZVpw|rwihX}QkN<q0-*cXGe!u5;o^yQ=
zi+dQ0i}fUUzYG%TDi--rM7D=TreG&dz^nKH-a{Y0#;KSVF&5xB;?Gg<Z^1%5iVi-&
z5GIv~%)wI3K@U^$e2IAP6WnGZg^5R2`PdXP7ByiAC*fMFhk3-uP!s=#djD%o#}TC>
zTQL{^!EStp9ScO};;w}vm#}xCC$gA9OPR=Eyoph~gEU1VpO_u(#TmqXs5^OyF3v0$
z$;T?J!VVih!$RU2i_E%B=n!|J7TAXs_|#*dEh?r8ijr1bg4gjQOeI)@E76Z<kxj@$
zT!pijimbprSc~_u9!q(85ne=1{01lE^krtFW!CoC&{>}DypD-Dj9Qzl+pR5D4;xt5
zhPv}t=tF0@NCqxK-C+~zt2tu5f|<kvNbNGb()ej5XP}0OQ%rn`W7tjswxhQEuJtYI
zgELl|MCG`ScpK7f`5k#{GL5#l*of1x%X$NgiJzmMft=N*!wsuB1AZn>Gm$t*<S%Sa
z5P3r1>*G1y)uxdC4I*P%_YU;|DH}z?Sb+&cL=NH(?mt>*TJ77y7sd7Y*n*dF6ozQu
zXe`H(SnV;0Fo@zwyoBAjvC$+R6&3v;WG;R~K|4`fo6OUf@$Ldh&9b|d7zeP5`5f9g
zn|NQFdEQmjGqUL`bIAKKNbHsF<WpeKhB1unGOhX#_Ywzpn*w@q4sqfh3c(^gfwxc}
z)Xd^SJcIfwUtkXfH+*g8Cw^zvuf=q(58Ee_O@7H@ki*1!>mdvf-$G3&`_1n`9_rbs
z!hGz+2=?3SY2Tam^HA^Kh9r=mt$*Tl;^cO7Hi8%=zkJ3ZfeVL`&dHA$#-FeVAKQ7S
zLxc@U0Cj!7wE(k;OHg<A1!mxJoQ2m>6aS0japD2<HRNF``DHx=UD%5HliRHq@EYp7
z9<av!VB)DbiTM&t!wonBci>3ek6K6<4#z%B#$Qo?+W*Exj6X>KbwM(N6r6y1Ase-T
zc{mzZp(fmH{T7E3_n`jIxPVLX57f?N9x{altYJ)Ieg*Q8y#JE2kiT<fNzJ+O&X&fS
zKzncTf~;(x8w|PrOuy^8iAxqc6*Wz@(c1btCtSU?Cgcma{yfLcbpou*54pi}q50{R
F{{x+&2ulC}

delta 1685
zcmXZcS!|3^6u|MLVcN7BilRi?qSP`>r&Br;blTC)UR6sggrr157fVW`#=e9oMr(}_
z5ouE~Nj)I(fC>^(TVkn1B9_=mNJt~`Kkj|{-E;3Z_ndpaJKvjd#H(;bxWy5C&_(2I
zj!3eIteq?}1RHS>Ud4g<43qFD4#oIfqYwKLFGl@+4f^pII`IYiFe*=E90t&XwU~ex
z^Cb8`!CfZenRsjML@gvP-z3VwMB-9wEsiHXj+*!p>hFJI3Pu-j7<AzWJcr-0zEETW
zZk{4?1+PsBip*qCGgYK3-o`a}4{3_{r<oIN!x6-7s3-Y~E=-v&l8JM%4C`(D3H`)F
zXPD>8(MjBhT3{Q_#*aY;+M<b6K~b_EXW>nph<yl3aW<ym1>_L&3g_d9B9h})T!GKA
z5(Dg>jjgDOf8k&pQfv;IXAPZ>@&qGTs9-{^wyw3-SZlGG^*YoOf5Rk9og*?F3sFy2
zjrvNCSg+tH;tr%{i7YYB$8zGP67Ikz20b`N7VbxF^?mDa)QtzvGl>dtDRC9jWqFLe
zElH*wE?kAf@Raoy<`92IefMJ*n9i=mG~(t3+=1vWA}^V!afrO9-<93C)k{nv?aM^^
z^57rT4SFsY;g2BG(Ge+f2)FS2V-=>w1FJ+fus#Vl;$`fG8MLoA7GNAM#9XWhGPuCt
z5;o(~)h2Q58j*bB@wk_Qf~c*HVfSKgs}reNw$u@02bM8EmUfOI-n-T8cNO(+ly5Va
zyB)p6f$btUFj&VR%)r0HwCV@$Cid(!1zf{%#NBqWDNev9yo0*YY997u3+k)<f-Mxh
za*vr$s5j4-VhZbB4~V4WNc50j7MX#B(9Oaf)P$X=-vReQb2sK<CUGO?Vms=3{2}wa
z7xnj5s0q$mpJFO;Ovu~~4{G6M=per|FragC5+~ys%*J<iKJ_rCCw8I()2%*CC(cGa
z**YAKCvY_0L{0o1`(r|b`8T*Rfp`&)Ccms_pr6`vcHuheyY8_5wI(*2FJU$gV0{Vp
zz>OG(`%nuxh260Yd*VaXPx@<&Mmb{EW3W7)xIY737=v1w7kgtdCgO7IE{q~RkJ|b$
z7U2`r&I~(h3UOMqFqZkER&VT{jL_|z!bn$An%n2j4D|~nGj@4>8ELIqfs~Se5E=XP

diff --git a/po/ru.po b/po/ru.po
index c2f1b79..1f4e3a1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/po/sr.gmo b/po/sr.gmo
index b395541a24c1d3c9ecdc2375d2628873845c5a0e..fb3c394ad7b92370482480463d384508a01fec8e 100644
GIT binary patch
delta 1732
zcmXZcS!|3^6u|M*q16bXsH!ez+A@ksrya|5&`?W_r3<a15;D|MYeXZKm?}ZqnxceQ
zVkyOgTIPX-K1kGyP$3>9f)_+WL}Pgn;(y%x^t<PN-*?Zs_dDMgz3jMq*>UqyT(~<%
zWK*F?iim`!i)7+%9EBG#37=pFzQ-(#pCK{=J(!5)n1(f&jt9|=S1^EGHts#s#CbT3
z`3*BA{6Fy_CI&Kb4K-m0j=`5W5*<Y*!Dwp`wV>6gg*V_JY{P84hwJb?zQwXx%(Kzl
zpvZ9Is@Wo^anJ0q$an^6b3}S#IZ~`F#wmCX$KpF2jfrzb@^LEqa3@a28#oWY;6$8A
zpzCZyeZB*8u^aO+t5}2@q%zDPhrvbUbmh6dkW?ZvfjES^&?)rdJLFI#p;TlNE<!Ef
zI9A~cEXSNOvw?k>L)?jaVn5J<L*^U9DRz)<by>5lZtEzk$Ld8d3;9qJth64pK140#
zJNhxWK*Wjln2fEME4=>>2HFf??S+0krA?TPye^rCOYj7Sup3ulMTH1&Med`%^Z13v
zJk<4;qW01*)aQ<24gRums8VDc`K6PAiwnOo71I`(E)Ad_aV`4rw)F!(B_6t%ZjTfB
zgaxq_u-xphsM_ps4QkKSBmF1s*v|dGa2d_mwx0XRFL4`bBy{6$Y{mYVvB`WDK6DZn
z;aFUQ1$Y)U!D}3f@tZ|>{gR2Pu_9YhPvS_e$j=@kx6n;|b-O9(8HT6Q_Q^ZU4y(xC
z&JE32f(2Bki6W>c@B}YlOdX41D{Avq>@m&Pg42k<;&}AcbNpC?q>zuO1&8*U=8Wv+
z{0}hE#l&MOuH0w7&&&os9p;0m6+b{N;1lWzq&1rP`8b?-2m0|mX5uRh;2+FKf0OyT
zwxF(e2Pfd$CU&HiCLJ<=v|?*5(w%Y!bMPtZLVr>J6aI*CGU|>CZM+{H#EmwNSX<D;
z{7KY;A7KW54l~eSXTN6ijy*VtxEROa3QWYqI1JmYk1(0|13FO-o1MF?GtkBKTGSmk
zVgg2S2zH_t5Priz6UH1dO*a@dksIT&2zz5GYQicT*P@fS4ioSKreG8`aToT%Z>Ssm
zi+o^`dX$F8tvFC*fb28_X+|xiHJaVGdR(k$^OowomPlc+m(S_V4|sE1-W0lY><@VJ
KqjA%&m;3{JRQe78

delta 1726
zcmXZcTTIVk7{KvI2}`z)6sdoIN~Lo;I*h+WiGM0NEex4C)of)XKjhRwp&1ixIb1Lr
z+UUY2cVx_k&2ZtkG1Hg}W7vEj?|b!mpZ9lop7;Gd@2~%|Pv2#q8<$2nL&HRBJR%cB
zq^dw<67Ir8Jdfk>0lM)GPDbB(B5@dxVd%w)SdCHGgj4VW=HsA^{R&N-jM2<*Dir5`
z;-gH2FmVYrVLv9}Q;f&Is0rfc8w*eiT8CQrAq>SHOu*Z?1>fLnELp%j3r#8#i6yQq
z7U{x0#g0fegYbnS!_kWrD-}2!&*C(Eg;O!GL?jPqU?$e%OuUMV@DonQYyy4H4%FxS
zF&&361EUv<P=k~?3{n}KM|M{p+Y7;7ksRVG)EAw?G<=0@h6I#S1eT)~a2!|R6Rg0*
zC1wE*rV<aJ?$|f<!H_beGu93wtdZ7etJ@lDjkiw4G+vZ~nqZB!!+H<3kgu4F1?3_x
zY{Urc#&qHP_cPFD_-rru^OQE>WaM+n0$hnFaUBlfMl4+_!dH<ysNdYT(wL0;zGbMr
zv=jBY4&032ZCtfXB#Znqz#xVTKQI!*mzyrlLfzt8%*5-~xA=rOYz5suLgWL^@}q#Y
zW`&+=v%>YLJ=2KvpIpIS?*EQ!XvUtc+)sWPwq2wF-MAOKF%T!#m{XC0E@BT(!}T}|
z&!8rFj^oj{mR-RpjP&DJqwYjo9gFi7xrS4SFYYo0Jwj&=Z6CVZtgw>oz1+}(Ud*F9
zP1KCK0}rqV|KLsR-e;PxbiZl7cAU%nXUxWw0~|4|MpDQ-)Pk#;Omj9jvHwSy7-ZrR
z6_*_}=QFB>@5X!qYQ=X^3;2M#1L3V^ei6nJ*I_Pp;Us*9`S=s_Ftg2^u5GCAyM;OU
zvW=B!rNPI{AFaq*i*%=)##DTW`l4T`|B1|YV=n57XWDo_`Vb$sakI4@lbP>CE%-jV
z@uR~)|7`vp<{QUjC~*-c;c5)SR*c3T>wSzMev2;rjk@y4<Hp$-L%acX#fLEndodgb
zPz!KgFwlg5Fc5=Im_%+IMeIR;T!@;m(#EyuB5uGSJckpo7d7!92H+Re1^z+~n2b9q
z!Xc0v3}NG?-VCG#wUF+<gfZ1wot>Vdk!h~<jQot;&i9@e#%X!^S?PVF=U(^z1JjB4
AQ~&?~

diff --git a/po/sr.po b/po/sr.po
index 59be3f2..c5d3bea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index c574ba6bf2c432a4d7b97788e302d61b0a3042be..2e07679eac6e431f442b43559278bbc5f797b030 100644
GIT binary patch
delta 3963
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
GQU3!`M+zGN

delta 3817
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

diff --git a/po/sv.po b/po/sv.po
index 26d0b61..20a9fc6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/trader.pot b/po/trader.pot
index 1a28185..b296a32 100644
--- a/po/trader.pot
+++ b/po/trader.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\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"
@@ -18,20 +18,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr ""
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr ""
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr ""
 

From 1f574672fd17035584954ee7d32f84587628ab7c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 13:22:41 +1000
Subject: [PATCH 75/99] Enable conditional dependencies between Gnulib modules

---
 m4/gnulib-cache.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index dbbdadf..e74817f 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -65,6 +65,7 @@ gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
+gl_CONDITIONAL_DEPENDENCIES
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
 gl_WITNESS_C_MACRO([])

From 384631dd5cd01863e7d3b259b2f6c83ad2dcacb7 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 20:12:24 +1000
Subject: [PATCH 76/99] Make the addition of the Serbian translation more
 prominent in NEWS

---
 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index d69df28..319831b 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ Version 7.10 (not yet released)
 
 Added a data directory that contains a desktop file and appropriate icons.
 
+Added the Serbian translation, with thanks to Мирослав Николић.
+
 Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
 string starts or  ends with a new-line character,  its translation must do
 so as well.  This has an impact on labels in particular.  Also changed the
@@ -27,8 +29,6 @@ help text string  "Page N of M"  to allow  translations of the form  "Of M
 pages, this is page N".  In addition,  newer versions of lib/getopt.c have
 different strings.  All translations have been updated as a result.
 
-Added the Serbian translation, with thanks to Мирослав Николић.
-
 Migrated the source code repository  from Subversion  to Git.  Updated the
 documentation to suit,  and also listed  specific required version numbers
 for the Autoconf and Automake tools.

From c978e5b4d1480e09e15f90e8fd8cd89abef19d7d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 20:15:13 +1000
Subject: [PATCH 77/99] Remove the obsolete Gnulib gettext module

---
 NEWS               | 2 ++
 m4/gnulib-cache.m4 | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 319831b..42295da 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,8 @@ help text string  "Page N of M"  to allow  translations of the form  "Of M
 pages, this is page N".  In addition,  newer versions of lib/getopt.c have
 different strings.  All translations have been updated as a result.
 
+Removed the obsolete Gnulib gettext module.
+
 Migrated the source code repository  from Subversion  to Git.  Updated the
 documentation to suit,  and also listed  specific required version numbers
 for the Autoconf and Automake tools.
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index e74817f..d28c84d 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+#   gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,7 +37,6 @@ gl_MODULES([
   config-h
   crc
   getopt-gnu
-  gettext
   gettext-h
   gettimeofday
   locale

From d917d088f4be96d267ead006f96d61b37650e61c Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 23 May 2017 22:14:11 +1000
Subject: [PATCH 78/99] Tweak the colours used for monochromatic screens; add
 an amber display

---
 README       |  4 ++--
 doc/trader.6 | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 0e4ff88..2174457 100644
--- a/README
+++ b/README
@@ -41,8 +41,8 @@ options, as well as some  suggestions for running a retro-computing green-
 screen nostalgia-tour  version of the game...  Try  running the following,
 for example (all on one line):
 
-    xterm -g 80x24 -fa Mono -fs 18 -bg black -fg '#009911' -bc +sb +bdc \
-        +fbx -xrm 'XTerm*colorBD: #00FF00' -e trader --no-colour &
+    xterm -g 80x24 -fa Mono -fs 18 -bg '#181818' -fg '#2CAB00' -bc +sb \
+        +bdc +fbx -xrm 'XTerm*colorBD: #41FF00' -e trader --no-colour &
 
 To read the manual page, type "man trader" from the command line.
 
diff --git a/doc/trader.6 b/doc/trader.6
index 6e41151..e32c7e6 100644
--- a/doc/trader.6
+++ b/doc/trader.6
@@ -41,7 +41,7 @@
 .if \n[.g] .mso www.tmac
 .\"
 .\" *********************************************************************
-.TH TRADER 6 "14th May, 2017" "Unix-like systems"
+.TH TRADER 6 "23rd May, 2017" "Unix-like systems"
 .SH NAME
 trader \- a game of interstellar trading
 .\" *********************************************************************
@@ -136,7 +136,17 @@ experience, try (again, typed all on one line):
 .sp
 .nh
 .na
-.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg black \-fg '#009911' \-bc +sb +bdc +fbx \-xrm 'XTerm*colorBD: #00FF00' \-e trader \-\-no\-colour &"
+.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg '#181818' \-fg '#2CAB00' \-bc +sb +bdc +fbx \-xrm 'XTerm*colorBD: #41FF00' \-e trader \-\-no\-colour &"
+.ad
+.hy 14
+.sp
+.RE
+Or, if you prefer the old amber screens of yesteryear:
+.RS
+.sp
+.nh
+.na
+.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg '#101010' \-fg '#AB7A00' \-bc +sb +bdc +fbx \-xrm 'XTerm*colorBD: #FFB700' \-e trader \-\-no\-colour &"
 .ad
 .hy 14
 .sp

From 1a0047d6290d4c4f02915b626c5c58d6cf67ba6f Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 04:39:45 +1000
Subject: [PATCH 79/99] Update nb.po to the latest version from the Translation
 Project

---
 po/nb.po | 149 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 74 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index da4847f..0696a2e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,42 +8,59 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Johnny A. Solbu <johnny@solbu.net>, 2012-2015
+#   Johnny A. Solbu <johnny@solbu.net>, 2012-2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8-pre1\n"
+"Project-Id-Version: trader 7.10-pre1\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 23:17+1000\n"
-"PO-Revision-Date: 2015-08-27 01:56+0100\n"
+"POT-Creation-Date: 2017-05-20 12:28+1000\n"
+"PO-Revision-Date: 2017-05-23 18:28+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#: data/trader.desktop.in:3 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:4
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spill Star Traders, et enkelt spill med interstellar handel."
+
+#: data/trader.desktop.in:5
+msgid "game;interstellar;trading;strategy;"
+msgstr "spill;interstellar;handel;strategi;"
+
+#: data/trader.desktop.in:6
+msgid "trader"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ugyldig verdi for --max-turn: «%s»\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ugyldig operand «%s»\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ugyldig spillnummer «%s»\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: ekstra operand «%s»\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -79,7 +96,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Prøv «%s --help» for mer informasjon.\n"
 
 #: src/trader.c:311
@@ -443,10 +460,10 @@ msgstr "Ingen bedrifter på kartet"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1132,12 +1149,12 @@ msgstr "%s: ulovlig felt på linje %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: ugyldig felt på linje %d: «%s»"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: ugyldig verdi på linje %d: «%s»"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1539,19 +1556,18 @@ msgstr "@ Hjelpetekst, side 10\n"
 msgid "  How to Play  "
 msgstr "  Slik spiller man  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Side  %d av %d"
+msgid "Page %1$d of %2$d"
+msgstr "Side  %1$d av %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Trykk <MELLOMROM> for å fortsette ] "
@@ -1563,19 +1579,19 @@ msgstr "[ Trykk <MELLOMROM> for å fortsette ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Trykk <MELLOMROM> for å fortsette eller <BACKSPACE> for forrige side ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: streng har feil format: «%s»"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: tegn har ugyldig bredde: «%lc»"
 
 #: src/intf.c:434
@@ -1583,11 +1599,6 @@ msgstr "%s: tegn har ugyldig bredde: «%lc»"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal størrelsen er for liten (%d x %d kreves)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1595,7 +1606,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: «%s»"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1610,7 +1621,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: ugyldig tegn i streng: «%ls»"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1656,7 +1667,7 @@ msgstr "ikke mer minne"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: «%s»"
 
 #: src/utils.c:1081
@@ -1666,65 +1677,55 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: «%lc»"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valget «%s» er flertydig; muligheter:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: valget «%s%s» er tvetydig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: valget «%s%s» er tvetydig; muligheter:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke et argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: ukjent valg «%s%s»\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: valget «%s%s» tillater ikke argumenter\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valget «--%s» krever et argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: valget «%s%s» krever et argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig valg -- «%c»\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valget krever et argument -- «%c»\n"
 
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er flertydig\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: valget «--%s» tillater ikke et argument\n"
 
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: ukjent valg «--%s»\n"
 
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valget «-W %s» krever et argument\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: valget «-W %s» er flertydig\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: valget «-W %s» krever et argument\n"

From 529bfa9eab1c118d4964c1a4be63e6f40490f052 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 04:52:20 +1000
Subject: [PATCH 80/99] Update the range of contribution dates for English
 translations

---
 po/en_AU.po | 4 ++--
 po/en_CA.po | 4 ++--
 po/en_GB.po | 4 ++--
 po/en_US.po | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/en_AU.po b/po/en_AU.po
index 9cc3f67..7699d7c 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 2bd88a0..390cd4f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 806e7c6..cf3cbee 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index 35added..42b3dc3 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-16, 2017.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
 "Language: en_US\n"

From 53bb6ba8d83f807e9fa95978332bef222daf3b33 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 05:49:32 +1000
Subject: [PATCH 81/99] Replace U+0020 SPACE with U+00A0 NO-BREAK SPACE again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After discussion with Frédéric Marchal, decided to use U+00A0 for
non-Ncurses strings after all.  Ncurses on certain platforms (at least
FreeBSD 11.0 and possibly MacOS X) aborts the program with "mkchstr: ...:
Illegal byte sequence" if U+00A0 is used in an Ncurses string.
---
 po/fr.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index f069d01..be9467b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:20+1000\n"
+"PO-Revision-Date: 2017-05-24 05:45+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -62,22 +62,22 @@ msgstr "trader"
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: '%s'\n"
-msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
+msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
 
 #: src/trader.c:251
 #, c-format
 msgid "%s: invalid operand '%s'\n"
-msgstr "%s: opérande invalide « %s »\n"
+msgstr "%s: opérande invalide « %s »\n"
 
 #: src/trader.c:260
 #, c-format
 msgid "%s: invalid game number '%s'\n"
-msgstr "%s: numéro de jeu invalide « %s »\n"
+msgstr "%s: numéro de jeu invalide « %s »\n"
 
 #: src/trader.c:269
 #, c-format
 msgid "%s: extra operand '%s'\n"
-msgstr "%s: opérande surnuméraire « %s »\n"
+msgstr "%s: opérande surnuméraire « %s »\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
 #. name of the author.  The IPA pronunciation in this comment is in
@@ -114,7 +114,7 @@ msgstr ""
 #: src/trader.c:308
 #, c-format
 msgid "%s: Try '%s --help' for more information.\n"
-msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
+msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
 
 #: src/trader.c:311
 #, c-format
@@ -1166,12 +1166,12 @@ msgstr "%s: champ illégal à la ligne %d"
 #: src/fileio.c:51
 #, c-format
 msgid "%s: illegal field on line %d: '%s'"
-msgstr "%s: champ illégal à la ligne %d: « %s »"
+msgstr "%s: champ illégal à la ligne %d: « %s »"
 
 #: src/fileio.c:55
 #, c-format
 msgid "%s: illegal value on line %d: '%s'"
-msgstr "%s: valeur illégale à la ligne %d: « %s »"
+msgstr "%s: valeur illégale à la ligne %d: « %s »"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
 #, c-format
@@ -1615,12 +1615,12 @@ msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente
 #: src/intf.c:110
 #, c-format
 msgid "%s: string has incorrect format: '%s'"
-msgstr "%s: la chaîne a un format incorrect: « %s »"
+msgstr "%s: la chaîne a un format incorrect: « %s »"
 
 #: src/intf.c:126
 #, c-format
 msgid "%s: character has illegal width: '%lc'"
-msgstr "%s: caractère avec une largeur illégale: « %lc »"
+msgstr "%s: caractère avec une largeur illégale: « %lc »"
 
 #: src/intf.c:434
 #, c-format
@@ -1635,7 +1635,7 @@ msgstr "mkchstr_conv: NUL"
 #: src/intf.c:1568
 #, c-format
 msgid "mkchstr: '%s'"
-msgstr "mkchstr: « %s »"
+msgstr "mkchstr: « %s »"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
 #. default value into the input string, if entered as the very first
@@ -1650,7 +1650,7 @@ msgstr "=;"
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
 msgid "gettxline: illegal character in string: '%ls'"
-msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
+msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
 #. "input|No" contain the keycodes used to determine whether a
@@ -1696,7 +1696,7 @@ msgstr "pas assez de mémoire"
 #: src/utils.c:1041
 #, c-format
 msgid "xmbstowcs: '%s'"
-msgstr "xmbstowcs: « %s »"
+msgstr "xmbstowcs: « %s »"
 
 #: src/utils.c:1081
 #, c-format
@@ -1706,39 +1706,39 @@ msgstr "xwcrtomb: NUL"
 #: src/utils.c:1086
 #, c-format
 msgid "xwcrtomb: '%lc'"
-msgstr "xwcrtomb: « %lc »"
+msgstr "xwcrtomb: « %lc »"
 
 #: lib/getopt.c:278
 #, c-format
 msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: l'option « %s%s » est ambiguë\n"
+msgstr "%s: l'option « %s%s » est ambiguë\n"
 
 #: lib/getopt.c:284
 #, c-format
 msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
+msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
 
 #: lib/getopt.c:319
 #, c-format
 msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: option « %s%s » non reconnue\n"
+msgstr "%s: option « %s%s » non reconnue\n"
 
 #: lib/getopt.c:345
 #, c-format
 msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
+msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
 
 #: lib/getopt.c:360
 #, c-format
 msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: l'option « %s%s » exige un argument\n"
+msgstr "%s: l'option « %s%s » exige un argument\n"
 
 #: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: option invalide -- « %c »\n"
+msgstr "%s: option invalide -- « %c »\n"
 
 #: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'option exige un argument -- « %c »\n"
+msgstr "%s: l'option exige un argument -- « %c »\n"

From adb7a9847232531bc20fa1288543cfe6074210a5 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 05:54:20 +1000
Subject: [PATCH 82/99] Update en_GB.po to the latest version from the
 Translation Project

---
 po/en_GB.po | 159 ++++++++++++++++++++++++++--------------------------
 1 file changed, 78 insertions(+), 81 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index e6ed6e1..af29351 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,23 +1,23 @@
 # *************************************************************************
 # *                                                                       *
 # *            English (British) Translations for Star Traders            *
-# *                Copyright (C) 1990-2015, John Zaitseff                 *
+# *                Copyright (C) 1990-2017, John Zaitseff                 *
 # *                                                                       *
 # *************************************************************************
 #
-# This file is distributed under the same licence as Star Traders.
+# This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-15.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.8\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-26 21:10+1000\n"
-"PO-Revision-Date: 2015-08-18 08:07+1000\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
-"Language-Team: English (British)\n"
+"Language-Team: English (British) <(nothing)>\n"
 "Language: en_GB\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
@@ -25,24 +25,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:23
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Play Star Traders, a simple game of interstellar trading"
+
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
+msgid "game;interstellar;trading;strategy;"
+msgstr "game;interstellar;trading;strategy;"
+
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
+msgid "trader"
+msgstr "trader"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: invalid value for --max-turn: ‘%s’\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: invalid operand ‘%s’\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: invalid game number ‘%s’\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: extra operand ‘%s’\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -77,7 +104,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Try ‘%s --help’ for more information.\n"
 
 #: src/trader.c:311
@@ -437,10 +464,10 @@ msgstr "No companies on the map"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Company"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -1118,19 +1145,20 @@ msgstr[1] ""
 msgid "%s: missing field on line %d"
 msgstr "%s: missing field on line %d"
 
-#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390 src/fileio.c:393
+#: src/fileio.c:47 src/fileio.c:87 src/fileio.c:130 src/fileio.c:390
+#: src/fileio.c:393
 #, c-format
 msgid "%s: illegal field on line %d"
 msgstr "%s: illegal field on line %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: illegal field on line %d: ‘%s’"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: illegal value on line %d: ‘%s’"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1328,7 +1356,7 @@ msgstr ""
 "also changes.  Players may also borrow from the Interstellar Trading Bank to\n"
 "finance additional purchases on the Stock Exchange.\n"
 "\n"
-"The map of the galaxy  is represented  by a ^B~x^N x ^B~y^N grid.  A typical section\n"
+"The map of the galaxy  is represented  by a ^B~x^N × ^B~y^N grid.  A typical section\n"
 "of it may be:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1497,7 +1525,7 @@ msgstr ""
 "Once you select your move, you enter  the ^BInterstellar Stock Exchange^N.  Here\n"
 "you may  purchase shares,  sell them, borrow from  the Trading Bank or repay\n"
 "some of your debt (if applicable).  Note that each company  issues a limited\n"
-"number of shares -- you cannot go on buying for ever!  You may, however, bid\n"
+"number of shares — you cannot go on  buying for ever!  You may, however, bid\n"
 "for more shares to be issued.  You have a better chance of succeeding if you\n"
 "own a larger proportion of the company.\n"
 "\n"
@@ -1532,19 +1560,18 @@ msgstr "@ Help text, page 10\n"
 msgid "  How to Play  "
 msgstr "  How to Play  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
+msgid "Page %1$d of %2$d"
+msgstr "Page %1$d of %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ Press <SPACE> to continue ] "
@@ -1556,19 +1583,19 @@ msgstr "[ Press <SPACE> to continue ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: string has incorrect format: ‘%s’"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: character has illegal width: ‘%lc’"
 
 #: src/intf.c:434
@@ -1576,11 +1603,6 @@ msgstr "%s: character has illegal width: ‘%lc’"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "terminal size is too small (%d x %d required)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1588,7 +1610,7 @@ msgstr "mkchstr_conv: NUL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: ‘%s’"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1603,7 +1625,7 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
+msgid "gettxline: illegal character in string: '%ls'"
 msgstr "gettxline: illegal character in string: ‘%ls’"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
@@ -1649,7 +1671,7 @@ msgstr "out of memory"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: ‘%s’"
 
 #: src/utils.c:1081
@@ -1659,65 +1681,40 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: ‘%lc’"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: option ‘%s’ is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: option ‘%s%s’ is ambiguous\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: option ‘%s’ is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: option ‘--%s’ doesn’t allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unrecognised option ‘%s%s’\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: option ‘%c%s’ doesn’t allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: option ‘--%s’ requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: option ‘%s%s’ requires an argument\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unrecognised option ‘--%s’\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unrecognised option ‘%c%s’\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: invalid option -- ‘%c’\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: option requires an argument -- ‘%c’\n"
-
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: option ‘-W %s’ is ambiguous\n"
-
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: option ‘-W %s’ doesn’t allow an argument\n"
-
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: option ‘-W %s’ requires an argument\n"

From ecf1cfc9837b6a640b4acbf2d6c40012c8d95376 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 06:43:49 +1000
Subject: [PATCH 83/99] Revise the comments for global game constants

---
 src/globals.h | 64 +++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/globals.h b/src/globals.h
index 93e6a06..1d6d128 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -36,64 +36,64 @@
 *                            Game constants                             *
 ************************************************************************/
 
-#define MAX_X			38	// Map dimensions MAX_X x MAX_Y
+#define MAX_X			38	// Map dimensions MAX_X x MAX_Y (do not change!)
 #define MAX_Y			14
-#define STAR_RATIO		0.10	// 10% of map should be stars
+#define STAR_RATIO		0.10	// Approximately 10% of the map should be stars
 
-#define NUMBER_MOVES		20	// Number of choices on map per turn
+#define NUMBER_MOVES		20	// Number of choices on the galaxy map per turn
 #define DEFAULT_MAX_TURN	50	// Default number of turns per game
 #define MIN_MAX_TURN		10	// Minimum that can be specified for max_turn
 
-#define MAX_PLAYERS		8	// Maximum number of players
+#define MAX_PLAYERS		8	// Maximum number of players (do not change!)
 #define INITIAL_CASH		6000.00	// Initial cash per player
-#define MAX_OVERDRAFT		1000.00	// Max. value player can go negative
-#define MAKE_BANKRUPT		0.07	// If overdraft, 7% chance of bankruptcy
+#define MAX_OVERDRAFT		1000.00	// Maximum value any player can go negative
+#define MAKE_BANKRUPT		0.07	// If a player is overdraft, 7% chance of bankruptcy
 
-#define MAX_COMPANIES		8	// Max. number of companies (do not change!)
-#define INITIAL_STOCK_ISSUED	5	// Initial number of shares issued out
-#define INITIAL_MAX_STOCK	50	// Initial max. number of shares available
-#define INITIAL_SHARE_PRICE	60.00	// Initial share price
+#define MAX_COMPANIES		8	// Maximum number of companies (do not change!)
+#define INITIAL_STOCK_ISSUED	5	// Initial number of shares issued on company creation
+#define INITIAL_MAX_STOCK	50	// Initial maximum number of shares available
+#define INITIAL_SHARE_PRICE	60.00	// Initial share price (before increments)
 
-#define SHARE_PRICE_INC		60.00	// Share price incr. for increase in shipping
-#define SHARE_PRICE_INC_OUTPOST	75.00	// Incr. for adding an outpost
-#define SHARE_PRICE_INC_OUTSTAR	150.00	// Extra incr. for adding outpost next to star
-#define SHARE_PRICE_INC_STAR	300.00	// Incr. for adding next to star
-#define PRICE_INC_ADJUST_MIN	0.75	// Actual incr. may be as low as 75% of nominal
-#define PRICE_INC_ADJUST_MAX	1.25	// Actual incr. may be as high as 125%
-#define MAX_STOCK_RATIO_MIN	0.10	// Min. multiplier to increment available shares
-#define MAX_STOCK_RATIO_MAX	0.25	// Max. multiplier, using share price incr.
+#define SHARE_PRICE_INC		60.00	// Share price increment for increase in shipping
+#define SHARE_PRICE_INC_OUTPOST	75.00	// Increment for adding an outpost
+#define SHARE_PRICE_INC_OUTSTAR	150.00	// Extra increment for adding an outpost next to a star
+#define SHARE_PRICE_INC_STAR	300.00	// Increment for expanding directly next to a star
+#define PRICE_INC_ADJUST_MIN	0.75	// Actual increment may be as low as 75% of nominal
+#define PRICE_INC_ADJUST_MAX	1.25	// Actual increment may be as high as 125%
+#define MAX_STOCK_RATIO_MIN	0.10	// Minimum multiplier to increment available shares
+#define MAX_STOCK_RATIO_MAX	0.25	// Maximum multiplier, using share price increment
 
 #define MERGE_STOCK_RATIO	0.50	// 50% of old shares are credited to new company
 #define MERGE_BONUS_RATE	10.0	// Multiplier for merger cash bonus
 #define MERGE_PRICE_ADJUST_MIN	0.40	// Minimum of old share price used as increment
 #define MERGE_PRICE_ADJUST_MAX	0.60	// Maximum of old share price used as increment
 #define COMPANY_BANKRUPTCY	0.03	// 3% chance of company bankruptcy (if return < 0)
-#define ALL_ASSETS_TAKEN	0.20	// 20% chance of assets taken of same
+#define ALL_ASSETS_TAKEN	0.20	// 20% chance of all assets taken in that case
 
-#define CHANGE_SHARE_PRICE	0.35	// 35% chance for changing share price
-#define DEC_SHARE_PRICE		0.65	// 65% x 35% chance of decrementing same
-#define PRICE_CHANGE_RATE	0.25	// Up to 25% of share price is used to incr./decr.
+#define CHANGE_SHARE_PRICE	0.35	// Chance of changing a share price each move
+#define DEC_SHARE_PRICE		0.65	// Chance that change will be negative
+#define PRICE_CHANGE_RATE	0.25	// Up to 25% of share price is used to increment/decrement
 #define INITIAL_RETURN		0.05	// Initial return per share: 5%
 #define MIN_COMPANY_RETURN	-0.15	// Minimum return per share (yes, negative!)
 #define MAX_COMPANY_RETURN	0.25	// Maximum return per share
-#define CHANGE_COMPANY_RETURN	0.50	// Chance of randomly changing return
-#define DEC_COMPANY_RETURN	0.50	// Chance such change will decrease return
+#define CHANGE_COMPANY_RETURN	0.50	// Chance of randomly changing a return each move
+#define DEC_COMPANY_RETURN	0.50	// Chance such a change will decrease return
 #define RETURN_MAX_CHANGE	0.03	// Maximum that company return will change
-#define CHANGE_RETURN_GROWING	0.25	// Chance of changing return when company grows
-#define DEC_RETURN_GROWING	0.35	// 35% chance such change will decrement return
+#define CHANGE_RETURN_GROWING	0.25	// Chance of changing return when the company grows
+#define DEC_RETURN_GROWING	0.35	// Chance such a change will decrement return
 #define GROWING_MAX_CHANGE	0.02	// Maximum that that return can change
 
-#define OWNERSHIP_BONUS		2.00	// Bonus amount based on percentage ownership
-#define BID_CHANCE		0.75	// 75% chance of successful bidding
-#define MAX_SHARES_BIDDED	200	// Max. number of shares issued
+#define OWNERSHIP_BONUS		2.00	// Bonus payment based on percentage ownership
+#define BID_CHANCE		0.70	// 70% chance of successful bidding
+#define MAX_SHARES_BIDDED	200	// Maximum number of shares issued
 
 #define INITIAL_INTEREST_RATE	0.10	// Initial bank interest rate: 10%
 #define MIN_INTEREST_RATE	0.02	// Minimum interest rate
 #define MAX_INTEREST_RATE	0.20	// Maximum interest rate
-#define CHANGE_INTEREST_RATE	0.40	// 40% chance of changing interest rate
-#define DEC_INTEREST_RATE	0.45	// 40% x 45% chance of decrease the same
+#define CHANGE_INTEREST_RATE	0.40	// Chance of changing the interest rate each move
+#define DEC_INTEREST_RATE	0.45	// Chance that change will be a decrease
 #define INTEREST_MAX_CHANGE	0.03	// Maximum that interest rate will change
-#define CREDIT_LIMIT_RATE	2.00	// Multiplier for credit limit
+#define CREDIT_LIMIT_RATE	2.00	// Multiplier for a player's credit limit
 
 #define ROUNDING_AMOUNT		0.01	// Round off smaller amounts to zero
 

From e226e6e6768a5dc4458c997cfef575861f8b5d33 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 07:10:17 +1000
Subject: [PATCH 84/99] Tweak global game constants for more dynamic play

---
 src/globals.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/globals.h b/src/globals.h
index 1d6d128..6ceaf8d 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -67,30 +67,30 @@
 #define MERGE_BONUS_RATE	10.0	// Multiplier for merger cash bonus
 #define MERGE_PRICE_ADJUST_MIN	0.40	// Minimum of old share price used as increment
 #define MERGE_PRICE_ADJUST_MAX	0.60	// Maximum of old share price used as increment
-#define COMPANY_BANKRUPTCY	0.03	// 3% chance of company bankruptcy (if return < 0)
+#define COMPANY_BANKRUPTCY	0.07	// 7% chance of company bankruptcy (if return < 0)
 #define ALL_ASSETS_TAKEN	0.20	// 20% chance of all assets taken in that case
 
-#define CHANGE_SHARE_PRICE	0.35	// Chance of changing a share price each move
+#define CHANGE_SHARE_PRICE	0.40	// Chance of changing a share price each move
 #define DEC_SHARE_PRICE		0.65	// Chance that change will be negative
 #define PRICE_CHANGE_RATE	0.25	// Up to 25% of share price is used to increment/decrement
 #define INITIAL_RETURN		0.05	// Initial return per share: 5%
 #define MIN_COMPANY_RETURN	-0.15	// Minimum return per share (yes, negative!)
 #define MAX_COMPANY_RETURN	0.25	// Maximum return per share
-#define CHANGE_COMPANY_RETURN	0.50	// Chance of randomly changing a return each move
-#define DEC_COMPANY_RETURN	0.50	// Chance such a change will decrease return
-#define RETURN_MAX_CHANGE	0.03	// Maximum that company return will change
-#define CHANGE_RETURN_GROWING	0.25	// Chance of changing return when the company grows
-#define DEC_RETURN_GROWING	0.35	// Chance such a change will decrement return
-#define GROWING_MAX_CHANGE	0.02	// Maximum that that return can change
+#define CHANGE_COMPANY_RETURN	0.60	// Chance of randomly changing a return each move
+#define DEC_COMPANY_RETURN	0.45	// Chance such a change will decrease return
+#define RETURN_MAX_CHANGE	0.04	// Maximum that company return will change
+#define CHANGE_RETURN_GROWING	0.35	// Chance of changing return when the company grows
+#define DEC_RETURN_GROWING	0.30	// Chance such a change will decrement return
+#define GROWING_MAX_CHANGE	0.03	// Maximum that that return can change
 
 #define OWNERSHIP_BONUS		2.00	// Bonus payment based on percentage ownership
 #define BID_CHANCE		0.70	// 70% chance of successful bidding
-#define MAX_SHARES_BIDDED	200	// Maximum number of shares issued
+#define MAX_SHARES_BIDDED	250	// Maximum number of shares issued
 
 #define INITIAL_INTEREST_RATE	0.10	// Initial bank interest rate: 10%
 #define MIN_INTEREST_RATE	0.02	// Minimum interest rate
 #define MAX_INTEREST_RATE	0.20	// Maximum interest rate
-#define CHANGE_INTEREST_RATE	0.40	// Chance of changing the interest rate each move
+#define CHANGE_INTEREST_RATE	0.35	// Chance of changing the interest rate each move
 #define DEC_INTEREST_RATE	0.45	// Chance that change will be a decrease
 #define INTEREST_MAX_CHANGE	0.03	// Maximum that interest rate will change
 #define CREDIT_LIMIT_RATE	2.00	// Multiplier for a player's credit limit

From 3d3a964b4d902bbf9a9b2aad135f59ebc0efa6ea Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 07:26:01 +1000
Subject: [PATCH 85/99] Update nb.po to the latest version from the Translation
 Project

---
 po/nb.po | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 0696a2e..906adf8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,21 +1,21 @@
 # *************************************************************************
 # *                                                                       *
 # *            Norwegian Bokmål Translations for Star Traders             *
-# *                   Copyright (C) 2012, John Zaitseff                   *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
 # *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Johnny A. Solbu <johnny@solbu.net>, 2012-2017
+#   Johnny A. Solbu <johnny@solbu.net>, 2012-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-23 18:28+0200\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-23 23:07+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -26,20 +26,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
-msgstr "Spill Star Traders, et enkelt spill med interstellar handel."
+msgstr "Spill Star Traders, et enkelt spill med interstellar handel"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "spill;interstellar;handel;strategi;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
 msgstr "trader"
 
@@ -1351,7 +1361,7 @@ msgstr ""
 "avkastningen på hver del (i prosent) endres også. Spillere kan også låne fra\n"
 "Interstellar Handelsbank for å finansiere flere kjøp på børsen.\n"
 "\n"
-"Kartet  over galaksen  er representert  ved en  ^B~x^N x ^B~y^N  rutenett. En typisk\n"
+"Kartet  over galaksen  er representert  ved en  ^B~x^N × ^B~y^N  rutenett. En typisk\n"
 "seksjon kan være:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1714,18 +1724,3 @@ msgstr "%s: ugyldig valg -- «%c»\n"
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valget krever et argument -- «%c»\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: valget «--%s» tillater ikke et argument\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: ukjent valg «--%s»\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: valget «-W %s» er flertydig\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: valget «-W %s» krever et argument\n"

From 7820f70b8d519d1c8f280dd552f86c31e95bd911 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 08:23:04 +1000
Subject: [PATCH 86/99] Make the licence text be its own paragraph in
 trader.desktop.in

---
 data/trader.desktop.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/trader.desktop.in b/data/trader.desktop.in
index c6a1533..6fa6bec 100644
--- a/data/trader.desktop.in
+++ b/data/trader.desktop.in
@@ -9,9 +9,10 @@
 # $Id$
 
 # This file provides a translated desktop entry for Star Traders and
-# conforms to the Desktop Entry Specification v1.1.  This file is
-# distributed under the same licence as Star Traders itself: the GNU
-# General Public License, version 3 or later.
+# conforms to the Desktop Entry Specification v1.1.
+#
+# This file is distributed under the same licence as Star Traders itself:
+# the GNU General Public License, version 3 or later.
 
 [Desktop Entry]
 # TRANSLATORS: The name of the game.  You may choose to translate it into

From 071587c3e61c81ae097f39a1d5ac958dec3f60ea Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 08:35:42 +1000
Subject: [PATCH 87/99] Update contribution dates to list full or specific
 years as appropriate

---
 po/da.po | 4 ++--
 po/ru.po | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/da.po b/po/da.po
index 0f8d102..1c98d31 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Joe Hansen <joedalton2@yahoo.dk>, 2012-15, 2017.
+#   Joe Hansen <joedalton2@yahoo.dk>, 2012, 2015, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-05-24 08:33+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff --git a/po/ru.po b/po/ru.po
index c2f1b79..fbd0a06 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-17.
+#   John Zaitseff <J.Zaitseff@zap.org.au>, 2011-2017.
 #   Vladimir B. Tsarkov <lipetsk-gnu-lug@bk.ru>, 2012.
 #   Pavel Maryanov <acid@jack.kiev.ua>, 2012.
 #
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-23 08:09+1000\n"
+"PO-Revision-Date: 2017-05-24 08:34+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"

From 48310e76547c6c4b13c5181a011e262797681c0b Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 08:46:08 +1000
Subject: [PATCH 88/99] Update contribution dates to list specific years in
 nb.po

---
 po/nb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 21ca362..a1478c5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Johnny A. Solbu <johnny@solbu.net>, 2012-2017.
+#   Johnny A. Solbu <johnny@solbu.net>, 2012, 2015, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 07:57+1000\n"
-"PO-Revision-Date: 2017-05-24 04:44+1000\n"
+"PO-Revision-Date: 2017-05-24 08:45+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"

From fd2f1267e515228fa1592e5b5fd4d507b49d0685 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 08:58:46 +1000
Subject: [PATCH 89/99] Update NEWS with all the latest changes since the
 previous release

---
 NEWS | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 42295da..5e5f2df 100644
--- a/NEWS
+++ b/NEWS
@@ -19,21 +19,31 @@ Version 7.10 (not yet released)
 -------------------------------
 
 Added a data directory that contains a desktop file and appropriate icons.
+Adjusted the game constants for more dynamic play:  allow the share prices
+and returns to change a bit more frequently and more rapidly.  Tweaked the
+colours in the example monochrome retro-computing command lines, including
+adding an amber monitor version.
 
-Added the Serbian translation, with thanks to Мирослав Николић.
+Added a Serbian translation, with thanks to Мирослав Николић.  Updated the
+Danish, French, Swedish, Hungarian  and Norwegian Bokmål translations,  in
+that order,  with thanks to  Joe Hansen, Frédéric Marchal, Anders Jonsson,
+Balázs Úr and Johnny A. Solbu respectively.
 
 Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
 string starts or  ends with a new-line character,  its translation must do
 so as well.  This has an impact on labels in particular.  Also changed the
 help text string  "Page N of M"  to allow  translations of the form  "Of M
-pages, this is page N".  In addition,  newer versions of lib/getopt.c have
+pages, this is page N", and all quoted strings using the obsolete GNU form
+`like this' to 'this'.  In addition,  newer versions of  lib/getopt.c have
 different strings.  All translations have been updated as a result.
 
-Removed the obsolete Gnulib gettext module.
+Removed the obsolete  Gnulib gettext module  and updated to the latest Git
+snapshot of Gnulib.  Updated the dependency version numbers  for Autoconf,
+Automake and Gettext.  Also updated all macros from the Autoconf Archive.
 
 Migrated the source code repository  from Subversion  to Git.  Updated the
 documentation to suit,  and also listed  specific required version numbers
-for the Autoconf and Automake tools.
+for the Autoconf and Automake tools in the INSTALL file.
 
 
 Version 7.9 (5th January, 2016)

From 7f5f185c8c0ed816406117eb25eb7df92257a10b Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 19:45:38 +1000
Subject: [PATCH 90/99] Update de.po to the latest version from the Translation
 Project

---
 po/de.po | 213 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 111 insertions(+), 102 deletions(-)

diff --git a/po/de.po b/po/de.po
index 11fa456..c8268fb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,48 +1,73 @@
 # *************************************************************************
-# *                                                                       *
-# *                 German Translations for Star Traders                  *
-# *                 Copyright (C) 2012-15, John Zaitseff                  *
-# *                                                                       *
+# * * * German Translations for Star Traders * * Copyright (C) 2012-15, John
+# Zaitseff * * *
 # *************************************************************************
 #
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#   Philipp Thomas <pth@suse.de>, 2012, 2015.
+#   Philipp Thomas <pth@suse.de>, 2012, 2015, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.7\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2015-08-18 09:44+1000\n"
-"PO-Revision-Date: 2015-08-24 11:45+0200\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-24 11:25+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
+#, c-format
+msgid "Star Traders"
+msgstr "Star Traders"
+
+#: data/trader.desktop.in:23
+msgid "Play Star Traders, a simple game of interstellar trading"
+msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel"
+
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
+msgid "game;interstellar;trading;strategy;"
+msgstr "spiel;universum;galaxie;handel;strategie;"
+
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
+msgid "trader"
+msgstr "Star Traders"
+
 #: src/trader.c:235
 #, c-format
-msgid "%s: invalid value for --max-turn: `%s'\n"
+msgid "%s: invalid value for --max-turn: '%s'\n"
 msgstr "%s: ungültiger Wert für --max-turn: „%s“\n"
 
 #: src/trader.c:251
 #, c-format
-msgid "%s: invalid operand `%s'\n"
+msgid "%s: invalid operand '%s'\n"
 msgstr "%s: ungültiger Operand „%s“\n"
 
 #: src/trader.c:260
 #, c-format
-msgid "%s: invalid game number `%s'\n"
+msgid "%s: invalid game number '%s'\n"
 msgstr "%s: ungültige Spielnummer „%s“\n"
 
 #: src/trader.c:269
 #, c-format
-msgid "%s: extra operand `%s'\n"
+msgid "%s: extra operand '%s'\n"
 msgstr "%s: zusätzlicher Operand „%s“\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
@@ -79,7 +104,7 @@ msgstr ""
 
 #: src/trader.c:308
 #, c-format
-msgid "%s: Try `%s --help' for more information.\n"
+msgid "%s: Try '%s --help' for more information.\n"
 msgstr "%s: Versuchen Sie „%s --help“ für ausführlichere Informationen.\n"
 
 #: src/trader.c:311
@@ -195,7 +220,7 @@ msgid "Fornax Express"
 msgstr "Fornax Express"
 
 #: src/globals.c:53
-msgid "Gemeni Inc"
+msgid "Gemini Inc"
 msgstr "Gemini OHG"
 
 #: src/globals.c:54
@@ -450,10 +475,10 @@ msgstr "Keine Firmen auf der Karte"
 #, c-format
 msgctxt "subtitle"
 msgid ""
-"\n"
+" \n"
 "Company"
 msgstr ""
-"\n"
+" \n"
 "Firma"
 
 #. TRANSLATORS: "Ownership" is a two-line column label
@@ -977,8 +1002,8 @@ msgctxt "label|Stock A"
 msgid "Return:          "
 msgstr "Rendite:             "
 
-#. TRANSLATORS: "Current holdings" is the number of shares the
-#. current player owns in this particular company.
+#. TRANSLATORS: "Current holdings" is the number of shares
+#. the current player owns in this particular company.
 #.
 #. Note that the labels "Current holdings", "Percentage owned"
 #. and "Current cash" MUST all be the same length and contain at
@@ -993,13 +1018,13 @@ msgstr "Akt. Anteil:     "
 
 #. TRANSLATORS: "Percentage owned" is the current player's
 #. percentage ownership in this particular company.
-#: src/exch.c:633
+#: src/exch.c:636
 #, c-format
 msgctxt "label|Stock B"
 msgid "Percentage owned: "
 msgstr "Prozent. Anteil: "
 
-#: src/exch.c:638
+#: src/exch.c:641
 #, c-format
 msgctxt "label|Stock B"
 msgid "Current cash:     "
@@ -1007,47 +1032,47 @@ msgstr "Akt. Bargeld:    "
 
 #. TRANSLATORS: Each label may be up to 35 characters wide
 #. (for <1> and <2>) or 36 characters wide (for <3> and <4>).
-#: src/exch.c:651
+#: src/exch.c:654
 #, c-format
 msgid "^{<1>^} Buy stock from company"
 msgstr "^{<1>^} Aktien der Firma erwerben"
 
-#: src/exch.c:653
+#: src/exch.c:656
 #, c-format
 msgid "^{<2>^} Sell stock back to company"
 msgstr "^{<2>^} Aktien der Firma verkaufen"
 
-#: src/exch.c:655
+#: src/exch.c:658
 #, c-format
 msgid "^{<3>^} Bid company to issue more shares"
 msgstr "^{<3>^} Ausgabe weiterer Aktien erbitten"
 
-#: src/exch.c:657
+#: src/exch.c:660
 #, c-format
 msgid "^{<4>^} Exit to the Stock Exchange"
 msgstr "^{<4>^} Die Börse verlassen"
 
-#: src/exch.c:660
+#: src/exch.c:663
 #, c-format
 msgid "Enter selection [^{1^}-^{4^}]: "
 msgstr "Ihre Wahl [^{1^}-^{4^}]: "
 
-#: src/exch.c:716
+#: src/exch.c:719
 #, c-format
 msgid "  No Shares Available  "
 msgstr "  Keine Aktien verfügbar  "
 
-#: src/exch.c:717
+#: src/exch.c:720
 #, c-format
 msgid "No more shares are available for purchase."
 msgstr "Keine erwerbbaren Aktien vorhanden."
 
-#: src/exch.c:721
+#: src/exch.c:724
 #, c-format
 msgid "  Insufficient Cash  "
 msgstr "  Unzureichnedes Bargeld  "
 
-#: src/exch.c:722
+#: src/exch.c:725
 #, c-format
 msgid ""
 "You do not have enough cash\n"
@@ -1056,47 +1081,47 @@ msgstr ""
 "Sie haben nicht genug Bargeld,\n"
 "um zusätzliche Aktien zu erwerben."
 
-#: src/exch.c:733
+#: src/exch.c:736
 #, c-format
 msgid "You can purchase ^{one^} share."
 msgid_plural "You can purchase up to ^{%'ld^} shares."
 msgstr[0] "Sie können ^{eine^} Aktie erwerben."
 msgstr[1] "Sie können bis zu ^{%'ld^} Aktien erwerben."
 
-#: src/exch.c:739
+#: src/exch.c:742
 #, c-format
 msgid "How many shares do you wish to purchase? "
 msgstr "Wieviele Aktien wollen Sie erwerben? "
 
-#: src/exch.c:760
+#: src/exch.c:763
 #, c-format
 msgid "  No Shares  "
 msgstr "  Keine Aktien  "
 
-#: src/exch.c:761
+#: src/exch.c:764
 #, c-format
 msgid "You do not have any shares to sell."
 msgstr "Sie haben keine Aktien zu verkaufen."
 
-#: src/exch.c:768
+#: src/exch.c:771
 #, c-format
 msgid "You can sell ^{one^} share."
 msgid_plural "You can sell up to ^{%'ld^} shares."
 msgstr[0] "Sie können ^{eine^} Aktie verkaufen."
 msgstr[1] "Sie können bis zu ^{%'ld^} Aktien verkaufen."
 
-#: src/exch.c:774
+#: src/exch.c:777
 #, c-format
 msgid "How many shares do you wish to sell? "
 msgstr "Wieviele Aktien wollen Sie verkaufen? "
 
-#: src/exch.c:802
+#: src/exch.c:805
 #, c-format
 msgid "  No Shares Issued  "
 msgstr "  Keine Aktien Ausgegeben  "
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/exch.c:804
+#: src/exch.c:807
 #, c-format
 msgid ""
 "%ls has refused\n"
@@ -1105,13 +1130,13 @@ msgstr ""
 "%ls hat sich geweigert,\n"
 "weitere Aktien auszugeben."
 
-#: src/exch.c:809
+#: src/exch.c:812
 #, c-format
 msgid "  Shares Issued  "
 msgstr "  Ausgegeben Aktien  "
 
 #. TRANSLATORS: %ls represents the company name.
-#: src/exch.c:811
+#: src/exch.c:814
 #, c-format
 msgid ""
 "%ls has issued\n"
@@ -1139,12 +1164,12 @@ msgstr "%s: unzulässiges Feld in Zeile %d"
 
 #: src/fileio.c:51
 #, c-format
-msgid "%s: illegal field on line %d: `%s'"
+msgid "%s: illegal field on line %d: '%s'"
 msgstr "%s: unzulässiges Feld in Zeile %d: „%s“"
 
 #: src/fileio.c:55
 #, c-format
-msgid "%s: illegal value on line %d: `%s'"
+msgid "%s: illegal value on line %d: '%s'"
 msgstr "%s: unzulässiger Wert in Zeile %d: „%s“"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
@@ -1548,19 +1573,18 @@ msgstr "@ Hilfe, Seite 10\n"
 msgid "  How to Play  "
 msgstr "  Spielanleitung  "
 
-#. TRANSLATORS: The first %d is the current page number,
-#. the second is the number of pages your help text takes
-#. (6, in English).  You can replace the second %d with a
-#. fixed word, if you like.
-#: src/help.c:286
+#. TRANSLATORS: The parameter %1$d is the current page
+#. number, %2$d is the number of pages your help text
+#. takes (6, in English).
+#: src/help.c:285
 #, c-format
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
+msgid "Page %1$d of %2$d"
+msgstr "Seite %1$d von %2$d"
 
 #. TRANSLATORS: The reason the user is not asked "Press any
 #. key to continue" is historical: many, many people used to
 #. ask "where is the <ANY> key?" :-)
-#: src/help.c:487 src/intf.c:3035
+#: src/help.c:486 src/intf.c:3035
 #, c-format
 msgid "[ Press <SPACE> to continue ] "
 msgstr "[ <LEERTASTE> drücken um fortzufahren ] "
@@ -1572,19 +1596,19 @@ msgstr "[ <LEERTASTE> drücken um fortzufahren ] "
 #. <CANCEL>, <EXIT>, <CTRL><C>, <CTRL><G> or <CTRL><\>).
 #. Note that the maximum label length is 76 characters,
 #. including the trailing space.
-#: src/help.c:495
+#: src/help.c:494
 #, c-format
 msgid "[ Press <SPACE> to continue or <BACKSPACE> for the previous page ] "
 msgstr "[ <LEERTASTE> für nächste, <RÜCKSCHRITT> für vorherige Seite ] "
 
 #: src/intf.c:110
 #, c-format
-msgid "%s: string has incorrect format: `%s'"
+msgid "%s: string has incorrect format: '%s'"
 msgstr "%s: Die Zeichenkette hat ein falsches Format: „%s“"
 
 #: src/intf.c:126
 #, c-format
-msgid "%s: character has illegal width: `%lc'"
+msgid "%s: character has illegal width: '%lc'"
 msgstr "%s: Das Zeichen hat eine unzulässige Breite: „%lc“"
 
 #: src/intf.c:434
@@ -1592,11 +1616,6 @@ msgstr "%s: Das Zeichen hat eine unzulässige Breite: „%lc“"
 msgid "terminal size is too small (%d x %d required)"
 msgstr "Das Terminal ist zu klein (Mindestgröße ist %d x %d)"
 
-#: src/intf.c:610
-#, c-format
-msgid "Star Traders"
-msgstr "Star Traders"
-
 #: src/intf.c:1265
 #, c-format
 msgid "mkchstr_conv: NUL"
@@ -1604,7 +1623,7 @@ msgstr "mkchstr_conv: NULL"
 
 #: src/intf.c:1568
 #, c-format
-msgid "mkchstr: `%s'"
+msgid "mkchstr: '%s'"
 msgstr "mkchstr: „%s“"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
@@ -1619,8 +1638,8 @@ msgstr "=;"
 
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
-msgid "gettxline: illegal character in string: `%ls'"
-msgstr "gettxline: unzulässiges Zeichen in Zeichenkette „%ls“"
+msgid "gettxline: illegal character in string: '%ls'"
+msgstr "gettxline: unzulässiges Zeichen in der Zeichenkette „%ls“"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
 #. "input|No" contain the keycodes used to determine whether a
@@ -1665,7 +1684,7 @@ msgstr "Kein frier Speicer mehr vorhanden"
 
 #: src/utils.c:1041
 #, c-format
-msgid "xmbstowcs: `%s'"
+msgid "xmbstowcs: '%s'"
 msgstr "xmbstowcs: „%s“"
 
 #: src/utils.c:1081
@@ -1675,65 +1694,55 @@ msgstr "xwcrtomb: NUL"
 
 #: src/utils.c:1086
 #, c-format
-msgid "xwcrtomb: `%lc'"
+msgid "xwcrtomb: '%lc'"
 msgstr "xwcrtomb: „%lc“"
 
-#: lib/getopt.c:575 lib/getopt.c:604
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option „%s“ ist mehrdeutig; möglich wären:"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: Option „%s%s“ ist mehrdeutig\n"
 
-#: lib/getopt.c:619
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: Option „%s“ ist mehrdeutig\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: Option „%s%s“ ist mehrdeutig; möglich wären:"
 
-#: lib/getopt.c:654 lib/getopt.c:658
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: unbekannte Option „%s%s“\n"
 
-#: lib/getopt.c:667 lib/getopt.c:672
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n"
 
-#: lib/getopt.c:715 lib/getopt.c:734
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: Option „--%s“ erfordert ein Argumente\n"
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s: Option „%s%s“ erfordert ein Argumente\n"
 
-#: lib/getopt.c:772 lib/getopt.c:775
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unbekannte Option „--%s“\n"
-
-#: lib/getopt.c:783 lib/getopt.c:786
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unbekannte Option „%c%s“\n"
-
-#: lib/getopt.c:835 lib/getopt.c:838
+#: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- „%c“\n"
 
-#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
+#: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: die Option erfordert ein Argument -- „%c“\n"
 
-#: lib/getopt.c:964 lib/getopt.c:980
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n"
 
-#: lib/getopt.c:1004 lib/getopt.c:1022
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n"
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: unbekannte Option „--%s“\n"
 
-#: lib/getopt.c:1043 lib/getopt.c:1061
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option „-W %s“ erfordert ein Argument\n"
+#~ msgid "%s: option '-W %s' is ambiguous\n"
+#~ msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s: Option „-W %s“ erfordert ein Argument\n"

From 95d70daa0764de2770c1bd5c390d34db73041511 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 19:54:10 +1000
Subject: [PATCH 91/99] Mention the updated German translation

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 5e5f2df..93b10fc 100644
--- a/NEWS
+++ b/NEWS
@@ -25,9 +25,9 @@ colours in the example monochrome retro-computing command lines, including
 adding an amber monitor version.
 
 Added a Serbian translation, with thanks to Мирослав Николић.  Updated the
-Danish, French, Swedish, Hungarian  and Norwegian Bokmål translations,  in
-that order,  with thanks to  Joe Hansen, Frédéric Marchal, Anders Jonsson,
-Balázs Úr and Johnny A. Solbu respectively.
+Danish, French, Swedish, Hungarian, Norwegian Bokmål  and  German transla-
+tions, in that order,  with thanks to Joe Hansen, Frédéric Marchal, Anders
+Jonsson, Balázs Úr, Johnny A. Solbu and Philipp Thomas respectively.
 
 Updated translatable strings  to overcome a limitation of  msgfmt(1): if a
 string starts or  ends with a new-line character,  its translation must do

From 24ec66e00ee486d1006bef14432c19e6a9dd6c59 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Wed, 24 May 2017 20:38:32 +1000
Subject: [PATCH 92/99] Change "prints" to imperative "print" in a translator
 comment in help.c

---
 po/da.po    | 12 ++++++------
 po/de.po    | 12 ++++++------
 po/en_AU.po | 12 ++++++------
 po/en_CA.po | 12 ++++++------
 po/en_GB.po | 12 ++++++------
 po/en_US.po | 12 ++++++------
 po/eo.po    | 12 ++++++------
 po/fi.po    | 12 ++++++------
 po/fr.po    | 12 ++++++------
 po/hr.po    | 12 ++++++------
 po/hu.po    | 12 ++++++------
 po/nb.po    | 12 ++++++------
 po/ru.po    | 12 ++++++------
 po/sr.po    | 12 ++++++------
 po/sv.po    | 12 ++++++------
 src/help.c  |  2 +-
 16 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/po/da.po b/po/da.po
index 1c98d31..c2448b3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 08:33+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spil Star Traders, et simpelt spil med rumhandel"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "spil;interstellar;handel;strategi;"
 
@@ -48,7 +48,7 @@ msgstr "spil;interstellar;handel;strategi;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1306,7 +1306,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/de.po b/po/de.po
index bedce76..c895ba2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 19:49+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "spiel;universum;galaxie;handel;strategie;"
 
@@ -48,7 +48,7 @@ msgstr "spiel;universum;galaxie;handel;strategie;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1309,7 +1309,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/en_AU.po b/po/en_AU.po
index 7699d7c..8a3653a 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
@@ -28,18 +28,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
@@ -47,7 +47,7 @@ msgstr "game;interstellar;trading;strategy;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/en_CA.po b/po/en_CA.po
index 390cd4f..50a7192 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
@@ -28,18 +28,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
@@ -47,7 +47,7 @@ msgstr "game;interstellar;trading;strategy;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/en_GB.po b/po/en_GB.po
index 6b86b6c..706617c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 06:05+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
@@ -28,18 +28,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
@@ -47,7 +47,7 @@ msgstr "game;interstellar;trading;strategy;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/en_US.po b/po/en_US.po
index 42b3dc3..18e548e 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 04:51+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
@@ -28,18 +28,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
@@ -47,7 +47,7 @@ msgstr "game;interstellar;trading;strategy;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/eo.po b/po/eo.po
index 6502aba..a6d43b4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1301,7 +1301,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/fi.po b/po/fi.po
index 444c762..630c4c4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Tähtikauppiaat"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1305,7 +1305,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/fr.po b/po/fr.po
index be9467b..914c513 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 05:45+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -36,18 +36,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "jeu;interstellaire;commerce;stratégie;"
 
@@ -55,7 +55,7 @@ msgstr "jeu;interstellaire;commerce;stratégie;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1309,7 +1309,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/hr.po b/po/hr.po
index 17a01a0..dacc13b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:08+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -28,18 +28,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1305,7 +1305,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/hu.po b/po/hu.po
index 2dde9c6..154f57e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:37+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "játék;csillagközi;kereskedés;stratégia;"
 
@@ -48,7 +48,7 @@ msgstr "játék;csillagközi;kereskedés;stratégia;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1299,7 +1299,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/nb.po b/po/nb.po
index a1478c5..5e2d90f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 08:45+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spill Star Traders, et enkelt spill med interstellar handel"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "spill;interstellar;handel;strategi;"
 
@@ -48,7 +48,7 @@ msgstr "spill;interstellar;handel;strategi;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1301,7 +1301,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/ru.po b/po/ru.po
index fbd0a06..ff4b83e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-24 08:34+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -31,18 +31,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Звёздные торговцы"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Играть в «Звёздные торговцы», простую игру о межзвёздной торговле"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "игра;межзвёздная;торговля;стратегия;"
 
@@ -50,7 +50,7 @@ msgstr "игра;межзвёздная;торговля;стратегия;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1311,7 +1311,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/sr.po b/po/sr.po
index 59be3f2..6f4df97 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Звездани трговци"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Играјте Звездане трговце, једноставну игру међузвезданог трговања"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1302,7 +1302,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/sv.po b/po/sv.po
index 26d0b61..25e7c72 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 07:57+1000\n"
+"POT-Creation-Date: 2017-05-24 20:36+1000\n"
 "PO-Revision-Date: 2017-05-23 08:09+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -29,18 +29,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Spela Star Traders, ett enkelt spel om interstellär handel"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "spel;interstellär;handel;strategi;"
 
@@ -48,7 +48,7 @@ msgstr "spel;interstellär;handel;strategi;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1305,7 +1305,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/src/help.c b/src/help.c
index b35e120..eb8f925 100644
--- a/src/help.c
+++ b/src/help.c
@@ -78,7 +78,7 @@ static const char *help_text[HELP_TEXT_PAGES] = {
     ~y       - Print the height of the galaxy map (MAX_Y) [**]
     ~m       - Print the number of moves available (NUMBER_MOVES) [**]
     ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-    ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+    ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
     ~1 to ~9 - Print the keycode for the N-th choice of move [***]
     ~M       - Print the keycode for the last choice of move [***]
     ~A to ~H - Print the character used to represent the company on the galaxy map [***]

From 947006180f649686aad5cb6c54addb601d462796 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Thu, 25 May 2017 08:12:04 +1000
Subject: [PATCH 93/99] Update de.po to the latest version from the Translation
 Project

---
 po/de.po | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/po/de.po b/po/de.po
index c8268fb..f328247 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,8 @@
 # *************************************************************************
-# * * * German Translations for Star Traders * * Copyright (C) 2012-15, John
-# Zaitseff * * *
+# *                                                                       *
+# *                 German Translations for Star Traders                  *
+# *                 Copyright © 2012-17, John Zaitseff                  *
+# *                                                                       *
 # *************************************************************************
 #
 # This file is distributed under the same license as the trader package.
@@ -13,7 +15,7 @@ msgstr ""
 "Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-23 09:01+1000\n"
-"PO-Revision-Date: 2017-05-24 11:25+0200\n"
+"PO-Revision-Date: 2017-05-24 16:18+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -48,7 +50,7 @@ msgstr "spiel;universum;galaxie;handel;strategie;"
 #. and the various trader.png files in the data source code directory.
 #: data/trader.desktop.in:31
 msgid "trader"
-msgstr "Star Traders"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
@@ -1368,7 +1370,7 @@ msgstr ""
 "der  Interstellaren  Handelsbank  leihen,  um  weitere Akteinkäufe zu finan-\n"
 "zieren.\n"
 "\n"
-"Die Karte der Galaxie  wird dargetellt durch ein  ^B~x^N x ^B~y^N  Raster. Ein typi-\n"
+"Die Karte der Galaxie  wird dargetellt durch ein  ^B~x^N × ^B~y^N  Raster. Ein typi-\n"
 "scher Teil von ihr könnte so aussehen:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
@@ -1537,7 +1539,7 @@ msgstr ""
 "Wenn Sie Ihren Zug gewählt haben, betreten Sie die ^BInterstellare Börse^N. Hier\n"
 "können Sie Aktien kaufen oder  verkaufen, sich von der Handelsbank Geld lei-\n"
 "hen  oder einen Teil  ihrer Schulden  (so vorhanden)  zurückzahlen. Beachten\n"
-"Sie, daß jede  Firma eine beschränkte Zahl von Aktien  ausgibt -- Sie können\n"
+"Sie, daß jede  Firma eine  beschränkte Zahl von Aktien  ausgibt — Sie können\n"
 "nicht endlos kaufen! Sie können aber die  Firma  bitten, weitere Aktien aus-\n"
 "zugeben. Je größer ihr Anteil an  der Firma, desdo höher die Chance, das dem\n"
 "statt gegeben wird.\n"
@@ -1731,18 +1733,3 @@ msgstr "%s: ungültige Option -- „%c“\n"
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: die Option erfordert ein Argument -- „%c“\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: unbekannte Option „--%s“\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: Option „-W %s“ ist mehrdeutig\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: Option „-W %s“ erfordert ein Argument\n"

From 2eb2dae7bfbb6438078d24f771bd491cec8b026e Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 26 May 2017 07:39:31 +1000
Subject: [PATCH 94/99] Update hu.po to the latest version from the Translation
 Project

---
 po/hu.po | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index c0e8eab..8a14a69 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,14 +8,14 @@
 # This file is distributed under the same license as the trader package.
 #
 # Contributors:
-#
 #   Balázs Úr <urbalazs@gmail.com>, 2014, 2015, 2017.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-22 21:04+0200\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-25 23:32+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -24,24 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.2\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "játék;csillagközi;kereskedés;stratégia;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
-msgstr "kereskedő"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
@@ -1351,7 +1360,7 @@ msgstr ""
 "Banktól  is  kérhetnek  kölcsön  az  Értéktőzsdén  való  további  vásárlások\n"
 "finanszírozásához.\n"
 "\n"
-"A galaxis térképét egy ^B~x^N x ^B~y^N méretű rács ábrázolja.  Egy tipikus szelvénye\n"
+"A galaxis térképét egy ^B~x^N × ^B~y^N méretű rács ábrázolja.  Egy tipikus szelvénye\n"
 "az alábbi lehet:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"

From cb193c37d050088cbe877e62dab05690ddd1f611 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Mon, 29 May 2017 05:57:25 +1000
Subject: [PATCH 95/99] Update fr.po to the latest version from the Translation
 Project

---
 po/fr.po | 106 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index fdad02a..cdab00c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,19 +1,28 @@
-# French translation of trader.
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# *************************************************************************
+# *                                                                       *
+# *                 French Translations for Star Traders                  *
+# *                 Copyright (C) 2012-17, John Zaitseff                  *
+# *         Copyright (C) 2012-17, Free Software Foundation, Inc.         *
+# *                                                                       *
+# *************************************************************************
+#
 # This file is distributed under the same license as the trader package.
-# Frédéric Marchal <fmarchal@perso.be>, 2017.
+#
+# Contributors:
+#   Frédéric Marchal <fmarchal@perso.be>, 2012, 2015, 2017.
 #
 # Attention: ce fichier ne doit pas contenir d'espace insécable car le
-# programme est compilé avec ncurses qui n'affiche pas correctement
+# programme est compilé avec Ncurses qui n'affiche pas correctement
 # l'espace insécable. De plus, il est garanti qu'il n'y aura pas de
 # retour à la ligne forcé. Les ponctuations qui requierent un espace
 # insécable ne seront pas reportées à la ligne suivante.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre1\n"
+"Project-Id-Version: trader 7.10-pre2\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-20 12:28+1000\n"
-"PO-Revision-Date: 2017-05-21 15:20+0200\n"
+"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"PO-Revision-Date: 2017-05-26 08:43+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -23,42 +32,52 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: data/trader.desktop.in:3 src/intf.c:610
+#. TRANSLATORS: The name of the game.  You may choose to translate it into
+#. your own language (recommended) or keep it the same as the English
+#. version.  Feel free to look through other translations to see how
+#. others have done this.
+#: data/trader.desktop.in:22 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:4
+#: data/trader.desktop.in:23
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire"
 
-#: data/trader.desktop.in:5
+#. TRANSLATORS: A list of keywords describing Star Traders.  By all means
+#. add your own keywords!
+#: data/trader.desktop.in:26
 msgid "game;interstellar;trading;strategy;"
 msgstr "jeu;interstellaire;commerce;stratégie;"
 
-#: data/trader.desktop.in:6
+#. TRANSLATORS: This string is the name of the icon to use.  The Desktop
+#. Entry Specification states it is translatable, but unless you provide a
+#. matching icon, please leave it as "trader": this will use trader.svg
+#. and the various trader.png files in the data source code directory.
+#: data/trader.desktop.in:31
 msgid "trader"
-msgstr "commerce"
+msgstr "trader"
 
 #: src/trader.c:235
 #, c-format
 msgid "%s: invalid value for --max-turn: '%s'\n"
-msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
+msgstr "%s: valeur invalide pour --max-turn: « %s »\n"
 
 #: src/trader.c:251
 #, c-format
 msgid "%s: invalid operand '%s'\n"
-msgstr "%s: opérande invalide « %s »\n"
+msgstr "%s: opérande invalide « %s »\n"
 
 #: src/trader.c:260
 #, c-format
 msgid "%s: invalid game number '%s'\n"
-msgstr "%s: numéro de jeu invalide « %s »\n"
+msgstr "%s: numéro de jeu invalide « %s »\n"
 
 #: src/trader.c:269
 #, c-format
 msgid "%s: extra operand '%s'\n"
-msgstr "%s: opérande surnuméraire « %s »\n"
+msgstr "%s: opérande surnuméraire « %s »\n"
 
 #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper
 #. name of the author.  The IPA pronunciation in this comment is in
@@ -95,7 +114,7 @@ msgstr ""
 #: src/trader.c:308
 #, c-format
 msgid "%s: Try '%s --help' for more information.\n"
-msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
+msgstr "%s: Essayez « %s --help » pour plus d'informations.\n"
 
 #: src/trader.c:311
 #, c-format
@@ -1148,12 +1167,12 @@ msgstr "%s: champ illégal à la ligne %d"
 #: src/fileio.c:51
 #, c-format
 msgid "%s: illegal field on line %d: '%s'"
-msgstr "%s: champ illégal à la ligne %d: « %s »"
+msgstr "%s: champ illégal à la ligne %d: « %s »"
 
 #: src/fileio.c:55
 #, c-format
 msgid "%s: illegal value on line %d: '%s'"
-msgstr "%s: valeur illégale à la ligne %d: « %s »"
+msgstr "%s: valeur illégale à la ligne %d: « %s »"
 
 #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402
 #, c-format
@@ -1351,12 +1370,12 @@ msgstr ""
 "peuvent aussi emprunter à la Banque Interstellaire du Commerce pour financer\n"
 "des achats supplémentaires à la bourse.\n"
 "\n"
-"La  carte  de la galaxie  est  représentée par  une grille  de ^B~x^N x ^B~y^N.  Une\n"
+"La  carte  de la galaxie  est  représentée par  une grille  de ^B~x^N × ^B~y^N.  Une\n"
 "section typique pourrait être:\n"
 "\n"
 "        ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n"
-"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N represente un ^Bespace vide^N,\n"
-"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N represente une ^Bétoile^N.\n"
+"        ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N        ^e ~. ^N représente un ^Bespace vide^N,\n"
+"        ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N        ^s ~* ^N représente une ^Bétoile^N.\n"
 "        ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n"
 
 #: src/help.c:132
@@ -1597,17 +1616,17 @@ msgstr "[ Appuyez <ESPACE> pour continuer ou <RetArr> pour la page précédente
 #: src/intf.c:110
 #, c-format
 msgid "%s: string has incorrect format: '%s'"
-msgstr "%s: la chaîne a un format incorrect: « %s »"
+msgstr "%s: la chaîne a un format incorrect: « %s »"
 
 #: src/intf.c:126
 #, c-format
 msgid "%s: character has illegal width: '%lc'"
-msgstr "%s: caractère avec une largeur illégale: « %lc »"
+msgstr "%s: caractère avec une largeur illégale: « %lc »"
 
 #: src/intf.c:434
 #, c-format
 msgid "terminal size is too small (%d x %d required)"
-msgstr "la taille du terminal est trop petite (%d x %d requis)"
+msgstr "la taille du terminal est trop petite (%d × %d requis)"
 
 #: src/intf.c:1265
 #, c-format
@@ -1617,7 +1636,7 @@ msgstr "mkchstr_conv: NUL"
 #: src/intf.c:1568
 #, c-format
 msgid "mkchstr: '%s'"
-msgstr "mkchstr: « %s »"
+msgstr "mkchstr: « %s »"
 
 #. TRANSLATORS: This string specifies the keycodes used to insert the
 #. default value into the input string, if entered as the very first
@@ -1632,7 +1651,7 @@ msgstr "=;"
 #: src/intf.c:2034 src/intf.c:2079
 #, c-format
 msgid "gettxline: illegal character in string: '%ls'"
-msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
+msgstr "gettxline: caractère illégal dans la chaîne: « %ls »"
 
 #. TRANSLATORS: The strings with msgctxt "input|Yes" and
 #. "input|No" contain the keycodes used to determine whether a
@@ -1678,7 +1697,7 @@ msgstr "pas assez de mémoire"
 #: src/utils.c:1041
 #, c-format
 msgid "xmbstowcs: '%s'"
-msgstr "xmbstowcs: « %s »"
+msgstr "xmbstowcs: « %s »"
 
 #: src/utils.c:1081
 #, c-format
@@ -1688,54 +1707,39 @@ msgstr "xwcrtomb: NUL"
 #: src/utils.c:1086
 #, c-format
 msgid "xwcrtomb: '%lc'"
-msgstr "xwcrtomb: « %lc »"
+msgstr "xwcrtomb: « %lc »"
 
 #: lib/getopt.c:278
 #, c-format
 msgid "%s: option '%s%s' is ambiguous\n"
-msgstr "%s: l'option « %s%s » est ambiguë\n"
+msgstr "%s: l'option « %s%s » est ambiguë\n"
 
 #: lib/getopt.c:284
 #, c-format
 msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
+msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:"
 
 #: lib/getopt.c:319
 #, c-format
 msgid "%s: unrecognized option '%s%s'\n"
-msgstr "%s: option « %s%s » non reconnue\n"
+msgstr "%s: option « %s%s » non reconnue\n"
 
 #: lib/getopt.c:345
 #, c-format
 msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
+msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n"
 
 #: lib/getopt.c:360
 #, c-format
 msgid "%s: option '%s%s' requires an argument\n"
-msgstr "%s: l'option « %s%s » exige un argument\n"
+msgstr "%s: l'option « %s%s » exige un argument\n"
 
 #: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: option invalide -- « %c »\n"
+msgstr "%s: option invalide -- « %c »\n"
 
 #: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'option exige un argument -- « %c »\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: option « --%s » n'accepte pas d'argument\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: option « --%s » non reconnue\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: option « -W %s » est ambiguë\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: option « -W %s » n'accepte pas d'argument\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: option « -W %s » exige un argument\n"
+msgstr "%s: l'option exige un argument -- « %c »\n"

From d66fa33fb63c1f563c73f99ce57c873fa2e85810 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 2 Jun 2017 05:22:35 +1000
Subject: [PATCH 96/99] Update version number and release date: we release
 today!

---
 NEWS         | 4 ++--
 configure.ac | 2 +-
 doc/trader.6 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 93b10fc..b495c4a 100644
--- a/NEWS
+++ b/NEWS
@@ -15,8 +15,8 @@ browse  the Git repository on  The ZAP Group  web server  at the following
 location: http://www.zap.org.au/gitweb/trader.git
 
 
-Version 7.10 (not yet released)
--------------------------------
+Version 7.10 (2nd June, 2017)
+-----------------------------
 
 Added a data directory that contains a desktop file and appropriate icons.
 Adjusted the game constants for more dynamic play:  allow the share prices
diff --git a/configure.ac b/configure.ac
index cd2d4c4..7691ecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-AC_INIT([Star Traders], [7.10-pre2], [J.Zaitseff@zap.org.au], [trader],
+AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader],
         [http://www.zap.org.au/software/trader/])
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
diff --git a/doc/trader.6 b/doc/trader.6
index e32c7e6..0e2756b 100644
--- a/doc/trader.6
+++ b/doc/trader.6
@@ -41,7 +41,7 @@
 .if \n[.g] .mso www.tmac
 .\"
 .\" *********************************************************************
-.TH TRADER 6 "23rd May, 2017" "Unix-like systems"
+.TH TRADER 6 "2nd June, 2017" "Unix-like systems"
 .SH NAME
 trader \- a game of interstellar trading
 .\" *********************************************************************

From b15033cd959d21a3a65f9d2956d403193d850277 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 2 Jun 2017 05:28:32 +1000
Subject: [PATCH 97/99] Update version number in all PO files

---
 po/da.po    | 4 ++--
 po/de.po    | 4 ++--
 po/en_AU.po | 4 ++--
 po/en_CA.po | 4 ++--
 po/en_GB.po | 4 ++--
 po/en_US.po | 4 ++--
 po/eo.po    | 4 ++--
 po/fi.po    | 4 ++--
 po/fr.po    | 4 ++--
 po/hr.po    | 4 ++--
 po/hu.po    | 4 ++--
 po/nb.po    | 4 ++--
 po/ru.po    | 4 ++--
 po/sr.po    | 4 ++--
 po/sv.po    | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/da.po b/po/da.po
index c2448b3..b4ff87d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 08:33+1000\n"
+"PO-Revision-Date: 2017-06-02 05:26+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
diff --git a/po/de.po b/po/de.po
index b4b583d..6120230 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-25 08:16+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index 8a3653a..d3f5bd7 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 04:51+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
 "Language: en_AU\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 50a7192..6022fec 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 04:51+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
 "Language: en_CA\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 706617c..1a7f450 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 06:05+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
 "Language: en_GB\n"
diff --git a/po/en_US.po b/po/en_US.po
index 18e548e..335cfae 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 04:51+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
 "Language: en_US\n"
diff --git a/po/eo.po b/po/eo.po
index a6d43b4..f6ff5c2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
diff --git a/po/fi.po b/po/fi.po
index 630c4c4..e419005 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
diff --git a/po/fr.po b/po/fr.po
index d26ef8e..b13b10e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-29 06:00+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
diff --git a/po/hr.po b/po/hr.po
index dacc13b..e96597d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-23 08:08+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
diff --git a/po/hu.po b/po/hu.po
index 41c19d4..95a374d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-26 07:41+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
diff --git a/po/nb.po b/po/nb.po
index 5e2d90f..c87d06e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 08:45+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
diff --git a/po/ru.po b/po/ru.po
index ff4b83e..a03fd2d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,10 +15,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-24 08:34+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
diff --git a/po/sr.po b/po/sr.po
index 6f4df97..5cb8f84 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-23 08:09+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
diff --git a/po/sv.po b/po/sv.po
index 25e7c72..e7c5c8f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
 "POT-Creation-Date: 2017-05-24 20:36+1000\n"
-"PO-Revision-Date: 2017-05-23 08:09+1000\n"
+"PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"

From 1f763d94fe41553595b0dbb0a5de76ae9c5fbdc0 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 2 Jun 2017 05:31:43 +1000
Subject: [PATCH 98/99] Update POT creation date for release

---
 po/da.po    | 2 +-
 po/de.po    | 2 +-
 po/en_AU.po | 2 +-
 po/en_CA.po | 2 +-
 po/en_GB.po | 2 +-
 po/en_US.po | 2 +-
 po/eo.po    | 2 +-
 po/fi.po    | 2 +-
 po/fr.po    | 2 +-
 po/hr.po    | 2 +-
 po/hu.po    | 2 +-
 po/nb.po    | 2 +-
 po/ru.po    | 2 +-
 po/sr.po    | 2 +-
 po/sv.po    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/da.po b/po/da.po
index b4ff87d..3ff892e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:26+1000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.po b/po/de.po
index 6120230..9b78ee3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index d3f5bd7..c4cbd2a 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Australian) <(nothing)>\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 6022fec..44128cd 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (Canadian) <(nothing)>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 1a7f450..1375d25 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (British) <(nothing)>\n"
diff --git a/po/en_US.po b/po/en_US.po
index 335cfae..34f809c 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
 "Language-Team: English (US) <(nothing)>\n"
diff --git a/po/eo.po b/po/eo.po
index f6ff5c2..270583d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/fi.po b/po/fi.po
index e419005..2021112 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.po b/po/fr.po
index b13b10e..c332b79 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/po/hr.po b/po/hr.po
index e96597d..aea5472 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
diff --git a/po/hu.po b/po/hu.po
index 95a374d..1e9ab98 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/nb.po b/po/nb.po
index c87d06e..f1ec67c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/po/ru.po b/po/ru.po
index a03fd2d..f576149 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/po/sr.po b/po/sr.po
index 5cb8f84..af66a1d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
diff --git a/po/sv.po b/po/sv.po
index e7c5c8f..42b8daa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-24 20:36+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
 "PO-Revision-Date: 2017-06-02 05:27+1000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

From 52e392ffca1ecc3647a7997eae9e4525da2007e8 Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Fri, 2 Jun 2017 05:45:08 +1000
Subject: [PATCH 99/99] Update all auto-generated files

These files have been created by running ./build-aux/bootstrap with
Gnulib as at commit 6ec17baf91bc90fa969f402040f3c15b6e27ac04 (with a date
stamp of Sun May 28 08:43:13 2017 -0700), Autoconf 2.69, Automake 1.15
and Gettext 0.19.8.1.
---
 Makefile.in         |   25 +-
 aclocal.m4          | 1062 +++++++++++++++-
 configure           | 2898 ++++++++++++++++++++++++-------------------
 data/Makefile.in    |   23 +-
 data/trader.desktop |   32 +
 doc/Makefile.in     |   23 +-
 lib/Makefile.am     |   47 +-
 lib/Makefile.in     |  454 +++----
 m4/Makefile.in      |   23 +-
 m4/gettext.m4       |  420 -------
 m4/glibc2.m4        |   31 -
 m4/gnulib-comp.m4   |  267 +++-
 m4/gnulib-tool.m4   |   57 -
 m4/iconv.m4         |    2 +-
 m4/intdiv0.m4       |   87 --
 m4/intl.m4          |  304 -----
 m4/intldir.m4       |   19 -
 m4/intlmacosx.m4    |   56 -
 m4/intmax.m4        |   36 -
 m4/inttypes-pri.m4  |   42 -
 m4/inttypes_h.m4    |   29 -
 m4/lcmessage.m4     |   35 -
 m4/lock.m4          |   47 -
 m4/nls.m4           |   32 -
 m4/po.m4            |  453 -------
 m4/printf-posix.m4  |   48 -
 m4/progtest.m4      |   91 --
 m4/size_max.m4      |   79 --
 m4/stdint_h.m4      |   27 -
 m4/threadlib.m4     |  391 ------
 m4/uintmax_t.m4     |   30 -
 m4/visibility.m4    |   77 --
 m4/xsize.m4         |   12 -
 po/da.gmo           |  Bin 30291 -> 30286 bytes
 po/de.gmo           |  Bin 31037 -> 31194 bytes
 po/en@quot.gmo      |  Bin 29720 -> 29715 bytes
 po/en@quot.po       |   16 +-
 po/en_AU.gmo        |  Bin 29772 -> 29767 bytes
 po/en_CA.gmo        |  Bin 29770 -> 29765 bytes
 po/en_GB.gmo        |  Bin 29769 -> 29764 bytes
 po/en_US.gmo        |  Bin 29763 -> 29758 bytes
 po/eo.gmo           |  Bin 30173 -> 30168 bytes
 po/fi.gmo           |  Bin 30857 -> 30852 bytes
 po/fr.gmo           |  Bin 31626 -> 31664 bytes
 po/hr.gmo           |  Bin 30359 -> 30354 bytes
 po/hu.gmo           |  Bin 32238 -> 32233 bytes
 po/nb.gmo           |  Bin 29878 -> 30023 bytes
 po/ru.gmo           |  Bin 39012 -> 39007 bytes
 po/sr.gmo           |  Bin 37560 -> 37555 bytes
 po/sv.gmo           |  Bin 30262 -> 30257 bytes
 po/trader.pot       |   14 +-
 src/Makefile.in     |   23 +-
 52 files changed, 3248 insertions(+), 4064 deletions(-)
 delete mode 100644 m4/gettext.m4
 delete mode 100644 m4/glibc2.m4
 delete mode 100644 m4/gnulib-tool.m4
 delete mode 100644 m4/intdiv0.m4
 delete mode 100644 m4/intl.m4
 delete mode 100644 m4/intldir.m4
 delete mode 100644 m4/intlmacosx.m4
 delete mode 100644 m4/intmax.m4
 delete mode 100644 m4/inttypes-pri.m4
 delete mode 100644 m4/inttypes_h.m4
 delete mode 100644 m4/lcmessage.m4
 delete mode 100644 m4/lock.m4
 delete mode 100644 m4/nls.m4
 delete mode 100644 m4/po.m4
 delete mode 100644 m4/printf-posix.m4
 delete mode 100644 m4/progtest.m4
 delete mode 100644 m4/size_max.m4
 delete mode 100644 m4/stdint_h.m4
 delete mode 100644 m4/threadlib.m4
 delete mode 100644 m4/uintmax_t.m4
 delete mode 100644 m4/visibility.m4
 delete mode 100644 m4/xsize.m4

diff --git a/Makefile.in b/Makefile.in
index 410e0ba..dacfb7a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,15 +127,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -145,14 +144,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -236,7 +233,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \
 	build-aux/README build-aux/compile build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/config.rpath build-aux/config.sub \
 	build-aux/install-sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
diff --git a/aclocal.m4 b/aclocal.m4
index 9376535..9b84f63 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,517 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value '$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+               ]])],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                 ]])],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST([GENCAT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST([INTLOBJS])
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
+
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFPreferences.h>]],
+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFLocale.h>]],
+          [[CFLocaleCopyCurrent();]])],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
+
 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
 dnl serial 11 (pkg-config-0.29)
 dnl
@@ -296,6 +807,552 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.60])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+  # Seen the first line of the variable definition.
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
+
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
+
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1479,7 +2536,6 @@ m4_include([m4/extensions.m4])
 m4_include([m4/extern-inline.m4])
 m4_include([m4/fcntl-o.m4])
 m4_include([m4/getopt.m4])
-m4_include([m4/gettext.m4])
 m4_include([m4/gettimeofday.m4])
 m4_include([m4/glibc21.m4])
 m4_include([m4/gnulib-common.m4])
@@ -1490,7 +2546,6 @@ m4_include([m4/iconv_h.m4])
 m4_include([m4/iconv_open.m4])
 m4_include([m4/include_next.m4])
 m4_include([m4/inline.m4])
-m4_include([m4/intlmacosx.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
@@ -1511,11 +2566,8 @@ m4_include([m4/mbtowc.m4])
 m4_include([m4/memchr.m4])
 m4_include([m4/mmap-anon.m4])
 m4_include([m4/multiarch.m4])
-m4_include([m4/nls.m4])
 m4_include([m4/nocrash.m4])
 m4_include([m4/off_t.m4])
-m4_include([m4/po.m4])
-m4_include([m4/progtest.m4])
 m4_include([m4/ssize_t.m4])
 m4_include([m4/stdbool.m4])
 m4_include([m4/stddef_h.m4])
diff --git a/configure b/configure
index 298c764..1291836 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Star Traders 7.10-pre2.
+# Generated by GNU Autoconf 2.69 for Star Traders 7.10.
 #
 # Report bugs to <J.Zaitseff@zap.org.au>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Star Traders'
 PACKAGE_TARNAME='trader'
-PACKAGE_VERSION='7.10-pre2'
-PACKAGE_STRING='Star Traders 7.10-pre2'
+PACKAGE_VERSION='7.10'
+PACKAGE_STRING='Star Traders 7.10'
 PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
 PACKAGE_URL='http://www.zap.org.au/software/trader/'
 
@@ -645,6 +645,121 @@ CURSES_LIBS
 LIBGNU_LTLIBDEPS
 LIBGNU_LIBDEPS
 gltests_WITNESS
+gl_GNULIB_ENABLED_wmemcpy_FALSE
+gl_GNULIB_ENABLED_wmemcpy_TRUE
+gl_GNULIB_ENABLED_wctomb_FALSE
+gl_GNULIB_ENABLED_wctomb_TRUE
+gl_GNULIB_ENABLED_verify_FALSE
+gl_GNULIB_ENABLED_verify_TRUE
+gl_GNULIB_ENABLED_strnlen1_FALSE
+gl_GNULIB_ENABLED_strnlen1_TRUE
+gl_GNULIB_ENABLED_streq_FALSE
+gl_GNULIB_ENABLED_streq_TRUE
+gl_GNULIB_ENABLED_stdlib_FALSE
+gl_GNULIB_ENABLED_stdlib_TRUE
+gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_FALSE
+gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_TRUE
+gl_GNULIB_ENABLED_memchr_FALSE
+gl_GNULIB_ENABLED_memchr_TRUE
+gl_GNULIB_ENABLED_mbtowc_FALSE
+gl_GNULIB_ENABLED_mbtowc_TRUE
+gl_GNULIB_ENABLED_mbsinit_FALSE
+gl_GNULIB_ENABLED_mbsinit_TRUE
+gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_FALSE
+gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_TRUE
+gl_GNULIB_ENABLED_localcharset_FALSE
+gl_GNULIB_ENABLED_localcharset_TRUE
+gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE
+gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE
+gl_GNULIB_ENABLED_configmake_FALSE
+gl_GNULIB_ENABLED_configmake_TRUE
+gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_FALSE
+gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_TRUE
+NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
+NEXT_STDLIB_H
+REPLACE_WCTOMB
+REPLACE_UNSETENV
+REPLACE_STRTOD
+REPLACE_SETENV
+REPLACE_REALPATH
+REPLACE_REALLOC
+REPLACE_RANDOM_R
+REPLACE_QSORT_R
+REPLACE_PUTENV
+REPLACE_PTSNAME_R
+REPLACE_PTSNAME
+REPLACE_MKSTEMP
+REPLACE_MBTOWC
+REPLACE_MALLOC
+REPLACE_CANONICALIZE_FILE_NAME
+REPLACE_CALLOC
+HAVE_DECL_UNSETENV
+HAVE_UNLOCKPT
+HAVE_SYS_LOADAVG_H
+HAVE_STRUCT_RANDOM_DATA
+HAVE_STRTOULL
+HAVE_STRTOLL
+HAVE_STRTOD
+HAVE_DECL_SETENV
+HAVE_SETENV
+HAVE_SECURE_GETENV
+HAVE_RPMATCH
+HAVE_REALPATH
+HAVE_RANDOM_R
+HAVE_RANDOM_H
+HAVE_RANDOM
+HAVE_QSORT_R
+HAVE_PTSNAME_R
+HAVE_PTSNAME
+HAVE_POSIX_OPENPT
+HAVE_MKSTEMPS
+HAVE_MKSTEMP
+HAVE_MKOSTEMPS
+HAVE_MKOSTEMP
+HAVE_MKDTEMP
+HAVE_GRANTPT
+HAVE_GETSUBOPT
+HAVE_DECL_GETLOADAVG
+HAVE_CANONICALIZE_FILE_NAME
+HAVE_ATOLL
+HAVE__EXIT
+GNULIB_WCTOMB
+GNULIB_UNSETENV
+GNULIB_UNLOCKPT
+GNULIB_SYSTEM_POSIX
+GNULIB_STRTOULL
+GNULIB_STRTOLL
+GNULIB_STRTOD
+GNULIB_SETENV
+GNULIB_SECURE_GETENV
+GNULIB_RPMATCH
+GNULIB_REALPATH
+GNULIB_REALLOC_POSIX
+GNULIB_RANDOM_R
+GNULIB_RANDOM
+GNULIB_QSORT_R
+GNULIB_PUTENV
+GNULIB_PTSNAME_R
+GNULIB_PTSNAME
+GNULIB_POSIX_OPENPT
+GNULIB_MKSTEMPS
+GNULIB_MKSTEMP
+GNULIB_MKOSTEMPS
+GNULIB_MKOSTEMP
+GNULIB_MKDTEMP
+GNULIB_MBTOWC
+GNULIB_MALLOC_POSIX
+GNULIB_GRANTPT
+GNULIB_GETSUBOPT
+GNULIB_GETLOADAVG
+GNULIB_CANONICALIZE_FILE_NAME
+GNULIB_CALLOC_POSIX
+GNULIB_ATOLL
+GNULIB__EXIT
+LOCALCHARSET_TESTS_ENVIRONMENT
+GLIBC21
+pkglibexecdir
+lispdir
 REPLACE_TOWLOWER
 REPLACE_ISWCNTRL
 HAVE_WCTYPE_H
@@ -724,8 +839,79 @@ GNULIB_FSTAT
 GNULIB_FCHMODAT
 NEXT_AS_FIRST_DIRECTIVE_STRING_H
 NEXT_STRING_H
-NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
-NEXT_STDLIB_H
+UNDEFINE_STRTOK_R
+REPLACE_STRTOK_R
+REPLACE_STRSIGNAL
+REPLACE_STRNLEN
+REPLACE_STRNDUP
+REPLACE_STRNCAT
+REPLACE_STRERROR_R
+REPLACE_STRERROR
+REPLACE_STRCHRNUL
+REPLACE_STRCASESTR
+REPLACE_STRSTR
+REPLACE_STRDUP
+REPLACE_STPNCPY
+REPLACE_MEMMEM
+REPLACE_MEMCHR
+HAVE_STRVERSCMP
+HAVE_DECL_STRSIGNAL
+HAVE_DECL_STRERROR_R
+HAVE_DECL_STRTOK_R
+HAVE_STRCASESTR
+HAVE_STRSEP
+HAVE_STRPBRK
+HAVE_DECL_STRNLEN
+HAVE_DECL_STRNDUP
+HAVE_DECL_STRDUP
+HAVE_STRCHRNUL
+HAVE_STPNCPY
+HAVE_STPCPY
+HAVE_RAWMEMCHR
+HAVE_DECL_MEMRCHR
+HAVE_MEMPCPY
+HAVE_DECL_MEMMEM
+HAVE_MEMCHR
+HAVE_FFSLL
+HAVE_FFSL
+HAVE_MBSLEN
+GNULIB_STRVERSCMP
+GNULIB_STRSIGNAL
+GNULIB_STRERROR_R
+GNULIB_STRERROR
+GNULIB_MBSTOK_R
+GNULIB_MBSSEP
+GNULIB_MBSSPN
+GNULIB_MBSPBRK
+GNULIB_MBSCSPN
+GNULIB_MBSCASESTR
+GNULIB_MBSPCASECMP
+GNULIB_MBSNCASECMP
+GNULIB_MBSCASECMP
+GNULIB_MBSSTR
+GNULIB_MBSRCHR
+GNULIB_MBSCHR
+GNULIB_MBSNLEN
+GNULIB_MBSLEN
+GNULIB_STRTOK_R
+GNULIB_STRCASESTR
+GNULIB_STRSTR
+GNULIB_STRSEP
+GNULIB_STRPBRK
+GNULIB_STRNLEN
+GNULIB_STRNDUP
+GNULIB_STRNCAT
+GNULIB_STRDUP
+GNULIB_STRCHRNUL
+GNULIB_STPNCPY
+GNULIB_STPCPY
+GNULIB_RAWMEMCHR
+GNULIB_MEMRCHR
+GNULIB_MEMPCPY
+GNULIB_MEMMEM
+GNULIB_MEMCHR
+GNULIB_FFSLL
+GNULIB_FFSL
 NEXT_AS_FIRST_DIRECTIVE_STDIO_H
 NEXT_STDIO_H
 REPLACE_VSPRINTF
@@ -862,158 +1048,6 @@ GL_GENERATE_STDBOOL_H_FALSE
 GL_GENERATE_STDBOOL_H_TRUE
 STDBOOL_H
 APPLE_UNIVERSAL_BUILD
-UNDEFINE_STRTOK_R
-REPLACE_STRTOK_R
-REPLACE_STRSIGNAL
-REPLACE_STRNLEN
-REPLACE_STRNDUP
-REPLACE_STRNCAT
-REPLACE_STRERROR_R
-REPLACE_STRERROR
-REPLACE_STRCHRNUL
-REPLACE_STRCASESTR
-REPLACE_STRSTR
-REPLACE_STRDUP
-REPLACE_STPNCPY
-REPLACE_MEMMEM
-REPLACE_MEMCHR
-HAVE_STRVERSCMP
-HAVE_DECL_STRSIGNAL
-HAVE_DECL_STRERROR_R
-HAVE_DECL_STRTOK_R
-HAVE_STRCASESTR
-HAVE_STRSEP
-HAVE_STRPBRK
-HAVE_DECL_STRNLEN
-HAVE_DECL_STRNDUP
-HAVE_DECL_STRDUP
-HAVE_STRCHRNUL
-HAVE_STPNCPY
-HAVE_STPCPY
-HAVE_RAWMEMCHR
-HAVE_DECL_MEMRCHR
-HAVE_MEMPCPY
-HAVE_DECL_MEMMEM
-HAVE_MEMCHR
-HAVE_FFSLL
-HAVE_FFSL
-HAVE_MBSLEN
-GNULIB_STRVERSCMP
-GNULIB_STRSIGNAL
-GNULIB_STRERROR_R
-GNULIB_STRERROR
-GNULIB_MBSTOK_R
-GNULIB_MBSSEP
-GNULIB_MBSSPN
-GNULIB_MBSPBRK
-GNULIB_MBSCSPN
-GNULIB_MBSCASESTR
-GNULIB_MBSPCASECMP
-GNULIB_MBSNCASECMP
-GNULIB_MBSCASECMP
-GNULIB_MBSSTR
-GNULIB_MBSRCHR
-GNULIB_MBSCHR
-GNULIB_MBSNLEN
-GNULIB_MBSLEN
-GNULIB_STRTOK_R
-GNULIB_STRCASESTR
-GNULIB_STRSTR
-GNULIB_STRSEP
-GNULIB_STRPBRK
-GNULIB_STRNLEN
-GNULIB_STRNDUP
-GNULIB_STRNCAT
-GNULIB_STRDUP
-GNULIB_STRCHRNUL
-GNULIB_STPNCPY
-GNULIB_STPCPY
-GNULIB_RAWMEMCHR
-GNULIB_MEMRCHR
-GNULIB_MEMPCPY
-GNULIB_MEMMEM
-GNULIB_MEMCHR
-GNULIB_FFSLL
-GNULIB_FFSL
-REPLACE_WCTOMB
-REPLACE_UNSETENV
-REPLACE_STRTOD
-REPLACE_SETENV
-REPLACE_REALPATH
-REPLACE_REALLOC
-REPLACE_RANDOM_R
-REPLACE_QSORT_R
-REPLACE_PUTENV
-REPLACE_PTSNAME_R
-REPLACE_PTSNAME
-REPLACE_MKSTEMP
-REPLACE_MBTOWC
-REPLACE_MALLOC
-REPLACE_CANONICALIZE_FILE_NAME
-REPLACE_CALLOC
-HAVE_DECL_UNSETENV
-HAVE_UNLOCKPT
-HAVE_SYS_LOADAVG_H
-HAVE_STRUCT_RANDOM_DATA
-HAVE_STRTOULL
-HAVE_STRTOLL
-HAVE_STRTOD
-HAVE_DECL_SETENV
-HAVE_SETENV
-HAVE_SECURE_GETENV
-HAVE_RPMATCH
-HAVE_REALPATH
-HAVE_RANDOM_R
-HAVE_RANDOM_H
-HAVE_RANDOM
-HAVE_QSORT_R
-HAVE_PTSNAME_R
-HAVE_PTSNAME
-HAVE_POSIX_OPENPT
-HAVE_MKSTEMPS
-HAVE_MKSTEMP
-HAVE_MKOSTEMPS
-HAVE_MKOSTEMP
-HAVE_MKDTEMP
-HAVE_GRANTPT
-HAVE_GETSUBOPT
-HAVE_DECL_GETLOADAVG
-HAVE_CANONICALIZE_FILE_NAME
-HAVE_ATOLL
-HAVE__EXIT
-GNULIB_WCTOMB
-GNULIB_UNSETENV
-GNULIB_UNLOCKPT
-GNULIB_SYSTEM_POSIX
-GNULIB_STRTOULL
-GNULIB_STRTOLL
-GNULIB_STRTOD
-GNULIB_SETENV
-GNULIB_SECURE_GETENV
-GNULIB_RPMATCH
-GNULIB_REALPATH
-GNULIB_REALLOC_POSIX
-GNULIB_RANDOM_R
-GNULIB_RANDOM
-GNULIB_QSORT_R
-GNULIB_PUTENV
-GNULIB_PTSNAME_R
-GNULIB_PTSNAME
-GNULIB_POSIX_OPENPT
-GNULIB_MKSTEMPS
-GNULIB_MKSTEMP
-GNULIB_MKOSTEMPS
-GNULIB_MKOSTEMP
-GNULIB_MKDTEMP
-GNULIB_MBTOWC
-GNULIB_MALLOC_POSIX
-GNULIB_GRANTPT
-GNULIB_GETSUBOPT
-GNULIB_GETLOADAVG
-GNULIB_CANONICALIZE_FILE_NAME
-GNULIB_CALLOC_POSIX
-GNULIB_ATOLL
-GNULIB__EXIT
 LOCALE_FR_UTF8
 LOCALE_ZH_CN
 LOCALE_JA
@@ -1036,8 +1070,6 @@ HAVE_DUPLOCALE
 GNULIB_DUPLOCALE
 GNULIB_SETLOCALE
 GNULIB_LOCALECONV
-LOCALCHARSET_TESTS_ENVIRONMENT
-GLIBC21
 GL_GENERATE_LIMITS_H_FALSE
 GL_GENERATE_LIMITS_H_TRUE
 LIMITS_H
@@ -1225,8 +1257,6 @@ GNULIB_DUP
 GNULIB_CLOSE
 GNULIB_CHOWN
 GNULIB_CHDIR
-pkglibexecdir
-lispdir
 LOCALE_FR
 REPLACE_WCSFTIME
 REPLACE_WCSWIDTH
@@ -2021,7 +2051,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Star Traders 7.10-pre2 to adapt to many kinds of systems.
+\`configure' configures Star Traders 7.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2092,7 +2122,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Star Traders 7.10-pre2:";;
+     short | recursive ) echo "Configuration of Star Traders 7.10:";;
    esac
   cat <<\_ACEOF
 
@@ -2209,7 +2239,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Star Traders configure 7.10-pre2
+Star Traders configure 7.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2861,7 +2891,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Star Traders $as_me 7.10-pre2, which was
+It was created by Star Traders $as_me 7.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3151,17 +3181,16 @@ as_fn_append ac_header_list " sys/socket.h"
 as_fn_append ac_func_list " gettimeofday"
 as_fn_append ac_header_list " iconv.h"
 as_fn_append ac_header_list " limits.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_func_list " symlink"
 as_fn_append ac_header_list " xlocale.h"
 as_fn_append ac_func_list " mbsinit"
 as_fn_append ac_func_list " mbrtowc"
 as_fn_append ac_func_list " mbsrtowcs"
-as_fn_append ac_header_list " sys/mman.h"
-as_fn_append ac_func_list " mprotect"
 as_fn_append ac_header_list " wchar.h"
 as_fn_append ac_header_list " stdint.h"
+as_fn_append ac_header_list " sys/mman.h"
+as_fn_append ac_func_list " mprotect"
 as_fn_append ac_header_list " sys/stat.h"
+as_fn_append ac_header_list " unistd.h"
 as_fn_append ac_header_list " features.h"
 as_fn_append ac_header_list " crtdefs.h"
 as_fn_append ac_func_list " wcrtomb"
@@ -3169,6 +3198,7 @@ as_fn_append ac_func_list " wcsdup"
 as_fn_append ac_func_list " wctob"
 as_fn_append ac_func_list " iswcntrl"
 as_fn_append ac_header_list " wctype.h"
+as_fn_append ac_func_list " symlink"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3761,7 +3791,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='trader'
- VERSION='7.10-pre2'
+ VERSION='7.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5894,7 +5924,6 @@ fi
   # Code from module extern-inline:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
-  # Code from module gettext:
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
@@ -10479,204 +10508,6 @@ fi
 
 
 
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
-$as_echo_n "checking for working fcntl.h... " >&6; }
-if ${gl_cv_header_working_fcntl_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  gl_cv_header_working_fcntl_h=cross-compiling
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-           #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
-           #include <fcntl.h>
-           #ifndef O_NOATIME
-            #define O_NOATIME 0
-           #endif
-           #ifndef O_NOFOLLOW
-            #define O_NOFOLLOW 0
-           #endif
-           static int const constants[] =
-            {
-              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-            };
-
-int
-main ()
-{
-
-            int result = !constants;
-            #if HAVE_SYMLINK
-            {
-              static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              unlink (sym);
-            }
-            #endif
-            {
-              static char const file[] = "confdefs.h";
-              int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
-            }
-            return result;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_fcntl_h=yes
-else
-  case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOATIME $ac_val
-_ACEOF
-
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOFOLLOW $ac_val
-_ACEOF
-
-
-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
-_ACEOF
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky" >/dev/null 2>&1; then :
-  ac_cv_gnu_library_2_1=yes
-else
-  ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
-$as_echo "$ac_cv_gnu_library_2_1" >&6; }
-
-    GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
   GNULIB_LOCALECONV=0;
   GNULIB_SETLOCALE=0;
   GNULIB_DUPLOCALE=0;
@@ -11309,323 +11140,6 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
 
 
 
-  GNULIB__EXIT=0;
-  GNULIB_ATOLL=0;
-  GNULIB_CALLOC_POSIX=0;
-  GNULIB_CANONICALIZE_FILE_NAME=0;
-  GNULIB_GETLOADAVG=0;
-  GNULIB_GETSUBOPT=0;
-  GNULIB_GRANTPT=0;
-  GNULIB_MALLOC_POSIX=0;
-  GNULIB_MBTOWC=0;
-  GNULIB_MKDTEMP=0;
-  GNULIB_MKOSTEMP=0;
-  GNULIB_MKOSTEMPS=0;
-  GNULIB_MKSTEMP=0;
-  GNULIB_MKSTEMPS=0;
-  GNULIB_POSIX_OPENPT=0;
-  GNULIB_PTSNAME=0;
-  GNULIB_PTSNAME_R=0;
-  GNULIB_PUTENV=0;
-  GNULIB_QSORT_R=0;
-  GNULIB_RANDOM=0;
-  GNULIB_RANDOM_R=0;
-  GNULIB_REALLOC_POSIX=0;
-  GNULIB_REALPATH=0;
-  GNULIB_RPMATCH=0;
-  GNULIB_SECURE_GETENV=0;
-  GNULIB_SETENV=0;
-  GNULIB_STRTOD=0;
-  GNULIB_STRTOLL=0;
-  GNULIB_STRTOULL=0;
-  GNULIB_SYSTEM_POSIX=0;
-  GNULIB_UNLOCKPT=0;
-  GNULIB_UNSETENV=0;
-  GNULIB_WCTOMB=0;
-    HAVE__EXIT=1;
-  HAVE_ATOLL=1;
-  HAVE_CANONICALIZE_FILE_NAME=1;
-  HAVE_DECL_GETLOADAVG=1;
-  HAVE_GETSUBOPT=1;
-  HAVE_GRANTPT=1;
-  HAVE_MKDTEMP=1;
-  HAVE_MKOSTEMP=1;
-  HAVE_MKOSTEMPS=1;
-  HAVE_MKSTEMP=1;
-  HAVE_MKSTEMPS=1;
-  HAVE_POSIX_OPENPT=1;
-  HAVE_PTSNAME=1;
-  HAVE_PTSNAME_R=1;
-  HAVE_QSORT_R=1;
-  HAVE_RANDOM=1;
-  HAVE_RANDOM_H=1;
-  HAVE_RANDOM_R=1;
-  HAVE_REALPATH=1;
-  HAVE_RPMATCH=1;
-  HAVE_SECURE_GETENV=1;
-  HAVE_SETENV=1;
-  HAVE_DECL_SETENV=1;
-  HAVE_STRTOD=1;
-  HAVE_STRTOLL=1;
-  HAVE_STRTOULL=1;
-  HAVE_STRUCT_RANDOM_DATA=1;
-  HAVE_SYS_LOADAVG_H=0;
-  HAVE_UNLOCKPT=1;
-  HAVE_DECL_UNSETENV=1;
-  REPLACE_CALLOC=0;
-  REPLACE_CANONICALIZE_FILE_NAME=0;
-  REPLACE_MALLOC=0;
-  REPLACE_MBTOWC=0;
-  REPLACE_MKSTEMP=0;
-  REPLACE_PTSNAME=0;
-  REPLACE_PTSNAME_R=0;
-  REPLACE_PUTENV=0;
-  REPLACE_QSORT_R=0;
-  REPLACE_RANDOM_R=0;
-  REPLACE_REALLOC=0;
-  REPLACE_REALPATH=0;
-  REPLACE_SETENV=0;
-  REPLACE_STRTOD=0;
-  REPLACE_UNSETENV=0;
-  REPLACE_WCTOMB=0;
-
-
-
-
-
-
-  GNULIB_FFSL=0;
-  GNULIB_FFSLL=0;
-  GNULIB_MEMCHR=0;
-  GNULIB_MEMMEM=0;
-  GNULIB_MEMPCPY=0;
-  GNULIB_MEMRCHR=0;
-  GNULIB_RAWMEMCHR=0;
-  GNULIB_STPCPY=0;
-  GNULIB_STPNCPY=0;
-  GNULIB_STRCHRNUL=0;
-  GNULIB_STRDUP=0;
-  GNULIB_STRNCAT=0;
-  GNULIB_STRNDUP=0;
-  GNULIB_STRNLEN=0;
-  GNULIB_STRPBRK=0;
-  GNULIB_STRSEP=0;
-  GNULIB_STRSTR=0;
-  GNULIB_STRCASESTR=0;
-  GNULIB_STRTOK_R=0;
-  GNULIB_MBSLEN=0;
-  GNULIB_MBSNLEN=0;
-  GNULIB_MBSCHR=0;
-  GNULIB_MBSRCHR=0;
-  GNULIB_MBSSTR=0;
-  GNULIB_MBSCASECMP=0;
-  GNULIB_MBSNCASECMP=0;
-  GNULIB_MBSPCASECMP=0;
-  GNULIB_MBSCASESTR=0;
-  GNULIB_MBSCSPN=0;
-  GNULIB_MBSPBRK=0;
-  GNULIB_MBSSPN=0;
-  GNULIB_MBSSEP=0;
-  GNULIB_MBSTOK_R=0;
-  GNULIB_STRERROR=0;
-  GNULIB_STRERROR_R=0;
-  GNULIB_STRSIGNAL=0;
-  GNULIB_STRVERSCMP=0;
-  HAVE_MBSLEN=0;
-    HAVE_FFSL=1;
-  HAVE_FFSLL=1;
-  HAVE_MEMCHR=1;
-  HAVE_DECL_MEMMEM=1;
-  HAVE_MEMPCPY=1;
-  HAVE_DECL_MEMRCHR=1;
-  HAVE_RAWMEMCHR=1;
-  HAVE_STPCPY=1;
-  HAVE_STPNCPY=1;
-  HAVE_STRCHRNUL=1;
-  HAVE_DECL_STRDUP=1;
-  HAVE_DECL_STRNDUP=1;
-  HAVE_DECL_STRNLEN=1;
-  HAVE_STRPBRK=1;
-  HAVE_STRSEP=1;
-  HAVE_STRCASESTR=1;
-  HAVE_DECL_STRTOK_R=1;
-  HAVE_DECL_STRERROR_R=1;
-  HAVE_DECL_STRSIGNAL=1;
-  HAVE_STRVERSCMP=1;
-  REPLACE_MEMCHR=0;
-  REPLACE_MEMMEM=0;
-  REPLACE_STPNCPY=0;
-  REPLACE_STRDUP=0;
-  REPLACE_STRSTR=0;
-  REPLACE_STRCASESTR=0;
-  REPLACE_STRCHRNUL=0;
-  REPLACE_STRERROR=0;
-  REPLACE_STRERROR_R=0;
-  REPLACE_STRNCAT=0;
-  REPLACE_STRNDUP=0;
-  REPLACE_STRNLEN=0;
-  REPLACE_STRSIGNAL=0;
-  REPLACE_STRTOK_R=0;
-  UNDEFINE_STRTOK_R=0;
-
-
-
-
-
-  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
-  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
-  # irrelevant for anonymous mappings.
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  gl_have_mmap=yes
-else
-  gl_have_mmap=no
-fi
-
-
-  # Try to allow MAP_ANONYMOUS.
-  gl_have_mmap_anonymous=no
-  if test $gl_have_mmap = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
-$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANONYMOUS
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-  gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    if test $gl_have_mmap_anonymous != yes; then
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-    I cannot identify this map
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
-
-$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
-
-         gl_have_mmap_anonymous=yes
-fi
-rm -f conftest*
-
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-$as_echo "$gl_have_mmap_anonymous" >&6; }
-    if test $gl_have_mmap_anonymous = yes; then
-
-$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
-
-    fi
-  fi
-
-
-
-
-
-
-  if test $HAVE_MEMCHR = 1; then
-    # Detect platform-specific bugs in some versions of glibc:
-    # memchr should not dereference anything with length 0
-    #   http://bugzilla.redhat.com/499689
-    # memchr should not dereference overestimated length after a match
-    #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
-    #   http://sourceware.org/bugzilla/show_bug.cgi?id=10162
-    # Assume that memchr works on platforms that lack mprotect.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
-$as_echo_n "checking whether memchr works... " >&6; }
-if ${gl_cv_func_memchr_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-         gl_cv_func_memchr_works="guessing no"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <string.h>
-#if HAVE_SYS_MMAN_H
-# include <fcntl.h>
-# include <unistd.h>
-# include <sys/types.h>
-# include <sys/mman.h>
-# ifndef MAP_FILE
-#  define MAP_FILE 0
-# endif
-#endif
-
-int
-main ()
-{
-
-  int result = 0;
-  char *fence = NULL;
-#if HAVE_SYS_MMAN_H && HAVE_MPROTECT
-# if HAVE_MAP_ANONYMOUS
-  const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
-  const int fd = -1;
-# else /* !HAVE_MAP_ANONYMOUS */
-  const int flags = MAP_FILE | MAP_PRIVATE;
-  int fd = open ("/dev/zero", O_RDONLY, 0666);
-  if (fd >= 0)
-# endif
-    {
-      int pagesize = getpagesize ();
-      char *two_pages =
-        (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
-                       flags, fd, 0);
-      if (two_pages != (char *)(-1)
-          && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
-        fence = two_pages + pagesize;
-    }
-#endif
-  if (fence)
-    {
-      if (memchr (fence, 0, 0))
-        result |= 1;
-      strcpy (fence - 9, "12345678");
-      if (memchr (fence - 9, 0, 79) != fence - 1)
-        result |= 2;
-      if (memchr (fence - 1, 0, 3) != fence - 1)
-        result |= 4;
-    }
-  return result;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_memchr_works=yes
-else
-  gl_cv_func_memchr_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5
-$as_echo "$gl_cv_func_memchr_works" >&6; }
-    if test "$gl_cv_func_memchr_works" != yes; then
-      REPLACE_MEMCHR=1
-    fi
-  fi
-
-
     gl_cv_c_multiarch=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12928,6 +12442,81 @@ fi
   REPLACE_VSPRINTF=0;
 
 
+  GNULIB_FFSL=0;
+  GNULIB_FFSLL=0;
+  GNULIB_MEMCHR=0;
+  GNULIB_MEMMEM=0;
+  GNULIB_MEMPCPY=0;
+  GNULIB_MEMRCHR=0;
+  GNULIB_RAWMEMCHR=0;
+  GNULIB_STPCPY=0;
+  GNULIB_STPNCPY=0;
+  GNULIB_STRCHRNUL=0;
+  GNULIB_STRDUP=0;
+  GNULIB_STRNCAT=0;
+  GNULIB_STRNDUP=0;
+  GNULIB_STRNLEN=0;
+  GNULIB_STRPBRK=0;
+  GNULIB_STRSEP=0;
+  GNULIB_STRSTR=0;
+  GNULIB_STRCASESTR=0;
+  GNULIB_STRTOK_R=0;
+  GNULIB_MBSLEN=0;
+  GNULIB_MBSNLEN=0;
+  GNULIB_MBSCHR=0;
+  GNULIB_MBSRCHR=0;
+  GNULIB_MBSSTR=0;
+  GNULIB_MBSCASECMP=0;
+  GNULIB_MBSNCASECMP=0;
+  GNULIB_MBSPCASECMP=0;
+  GNULIB_MBSCASESTR=0;
+  GNULIB_MBSCSPN=0;
+  GNULIB_MBSPBRK=0;
+  GNULIB_MBSSPN=0;
+  GNULIB_MBSSEP=0;
+  GNULIB_MBSTOK_R=0;
+  GNULIB_STRERROR=0;
+  GNULIB_STRERROR_R=0;
+  GNULIB_STRSIGNAL=0;
+  GNULIB_STRVERSCMP=0;
+  HAVE_MBSLEN=0;
+    HAVE_FFSL=1;
+  HAVE_FFSLL=1;
+  HAVE_MEMCHR=1;
+  HAVE_DECL_MEMMEM=1;
+  HAVE_MEMPCPY=1;
+  HAVE_DECL_MEMRCHR=1;
+  HAVE_RAWMEMCHR=1;
+  HAVE_STPCPY=1;
+  HAVE_STPNCPY=1;
+  HAVE_STRCHRNUL=1;
+  HAVE_DECL_STRDUP=1;
+  HAVE_DECL_STRNDUP=1;
+  HAVE_DECL_STRNLEN=1;
+  HAVE_STRPBRK=1;
+  HAVE_STRSEP=1;
+  HAVE_STRCASESTR=1;
+  HAVE_DECL_STRTOK_R=1;
+  HAVE_DECL_STRERROR_R=1;
+  HAVE_DECL_STRSIGNAL=1;
+  HAVE_STRVERSCMP=1;
+  REPLACE_MEMCHR=0;
+  REPLACE_MEMMEM=0;
+  REPLACE_STPNCPY=0;
+  REPLACE_STRDUP=0;
+  REPLACE_STRSTR=0;
+  REPLACE_STRCASESTR=0;
+  REPLACE_STRCHRNUL=0;
+  REPLACE_STRERROR=0;
+  REPLACE_STRERROR_R=0;
+  REPLACE_STRNCAT=0;
+  REPLACE_STRNDUP=0;
+  REPLACE_STRNLEN=0;
+  REPLACE_STRSIGNAL=0;
+  REPLACE_STRTOK_R=0;
+  UNDEFINE_STRTOK_R=0;
+
+
 
 
 
@@ -13046,6 +12635,167 @@ fi
 
 
 
+
+
+
+
+
+  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
+  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+  # irrelevant for anonymous mappings.
+  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = xyes; then :
+  gl_have_mmap=yes
+else
+  gl_have_mmap=no
+fi
+
+
+  # Try to allow MAP_ANONYMOUS.
+  gl_have_mmap_anonymous=no
+  if test $gl_have_mmap = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
+$as_echo_n "checking for MAP_ANONYMOUS... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/mman.h>
+#ifdef MAP_ANONYMOUS
+    I cannot identify this map
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+  gl_have_mmap_anonymous=yes
+fi
+rm -f conftest*
+
+    if test $gl_have_mmap_anonymous != yes; then
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/mman.h>
+#ifdef MAP_ANON
+    I cannot identify this map
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
+
+$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
+
+         gl_have_mmap_anonymous=yes
+fi
+rm -f conftest*
+
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
+$as_echo "$gl_have_mmap_anonymous" >&6; }
+    if test $gl_have_mmap_anonymous = yes; then
+
+$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+
+    fi
+  fi
+
+
+
+
+
+
+  if test $HAVE_MEMCHR = 1; then
+    # Detect platform-specific bugs in some versions of glibc:
+    # memchr should not dereference anything with length 0
+    #   http://bugzilla.redhat.com/499689
+    # memchr should not dereference overestimated length after a match
+    #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
+    #   http://sourceware.org/bugzilla/show_bug.cgi?id=10162
+    # Assume that memchr works on platforms that lack mprotect.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
+$as_echo_n "checking whether memchr works... " >&6; }
+if ${gl_cv_func_memchr_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+         gl_cv_func_memchr_works="guessing no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.h>
+#if HAVE_SYS_MMAN_H
+# include <fcntl.h>
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/mman.h>
+# ifndef MAP_FILE
+#  define MAP_FILE 0
+# endif
+#endif
+
+int
+main ()
+{
+
+  int result = 0;
+  char *fence = NULL;
+#if HAVE_SYS_MMAN_H && HAVE_MPROTECT
+# if HAVE_MAP_ANONYMOUS
+  const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
+  const int fd = -1;
+# else /* !HAVE_MAP_ANONYMOUS */
+  const int flags = MAP_FILE | MAP_PRIVATE;
+  int fd = open ("/dev/zero", O_RDONLY, 0666);
+  if (fd >= 0)
+# endif
+    {
+      int pagesize = getpagesize ();
+      char *two_pages =
+        (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
+                       flags, fd, 0);
+      if (two_pages != (char *)(-1)
+          && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
+        fence = two_pages + pagesize;
+    }
+#endif
+  if (fence)
+    {
+      if (memchr (fence, 0, 0))
+        result |= 1;
+      strcpy (fence - 9, "12345678");
+      if (memchr (fence - 9, 0, 79) != fence - 1)
+        result |= 2;
+      if (memchr (fence - 1, 0, 3) != fence - 1)
+        result |= 4;
+    }
+  return result;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_memchr_works=yes
+else
+  gl_cv_func_memchr_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5
+$as_echo "$gl_cv_func_memchr_works" >&6; }
+    if test "$gl_cv_func_memchr_works" != yes; then
+      REPLACE_MEMCHR=1
+    fi
+  fi
+
+
+
+
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
   else
@@ -13530,6 +13280,8 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 
 
 
+
+
 gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
 i\
 0
@@ -13597,6 +13349,283 @@ q
 
 
 
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+$as_echo_n "checking for working fcntl.h... " >&6; }
+if ${gl_cv_header_working_fcntl_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_header_working_fcntl_h=cross-compiling
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+           #include <sys/stat.h>
+           #if HAVE_UNISTD_H
+           # include <unistd.h>
+           #else /* on Windows with MSVC */
+           # include <io.h>
+           # include <stdlib.h>
+           # defined sleep(n) _sleep ((n) * 1000)
+           #endif
+           #include <fcntl.h>
+           #ifndef O_NOATIME
+            #define O_NOATIME 0
+           #endif
+           #ifndef O_NOFOLLOW
+            #define O_NOFOLLOW 0
+           #endif
+           static int const constants[] =
+            {
+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+            };
+
+int
+main ()
+{
+
+            int result = !constants;
+            #if HAVE_SYMLINK
+            {
+              static char const sym[] = "conftest.sym";
+              if (symlink ("/dev/null", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              if (unlink (sym) != 0 || symlink (".", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              unlink (sym);
+            }
+            #endif
+            {
+              static char const file[] = "confdefs.h";
+              int fd = open (file, O_RDONLY | O_NOATIME);
+              if (fd < 0)
+                result |= 8;
+              else
+                {
+                  struct stat st0;
+                  if (fstat (fd, &st0) != 0)
+                    result |= 16;
+                  else
+                    {
+                      char c;
+                      sleep (1);
+                      if (read (fd, &c, 1) != 1)
+                        result |= 24;
+                      else
+                        {
+                          if (close (fd) != 0)
+                            result |= 32;
+                          else
+                            {
+                              struct stat st1;
+                              if (stat (file, &st1) != 0)
+                                result |= 40;
+                              else
+                                if (st0.st_atime != st1.st_atime)
+                                  result |= 64;
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_fcntl_h=yes
+else
+  case $? in #(
+        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+         *) gl_cv_header_working_fcntl_h='no';;
+        esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOATIME $ac_val
+_ACEOF
+
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOFOLLOW $ac_val
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
+$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
+if ${ac_cv_gnu_library_2_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky" >/dev/null 2>&1; then :
+  ac_cv_gnu_library_2_1=yes
+else
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+    GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+  GNULIB__EXIT=0;
+  GNULIB_ATOLL=0;
+  GNULIB_CALLOC_POSIX=0;
+  GNULIB_CANONICALIZE_FILE_NAME=0;
+  GNULIB_GETLOADAVG=0;
+  GNULIB_GETSUBOPT=0;
+  GNULIB_GRANTPT=0;
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_MBTOWC=0;
+  GNULIB_MKDTEMP=0;
+  GNULIB_MKOSTEMP=0;
+  GNULIB_MKOSTEMPS=0;
+  GNULIB_MKSTEMP=0;
+  GNULIB_MKSTEMPS=0;
+  GNULIB_POSIX_OPENPT=0;
+  GNULIB_PTSNAME=0;
+  GNULIB_PTSNAME_R=0;
+  GNULIB_PUTENV=0;
+  GNULIB_QSORT_R=0;
+  GNULIB_RANDOM=0;
+  GNULIB_RANDOM_R=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_REALPATH=0;
+  GNULIB_RPMATCH=0;
+  GNULIB_SECURE_GETENV=0;
+  GNULIB_SETENV=0;
+  GNULIB_STRTOD=0;
+  GNULIB_STRTOLL=0;
+  GNULIB_STRTOULL=0;
+  GNULIB_SYSTEM_POSIX=0;
+  GNULIB_UNLOCKPT=0;
+  GNULIB_UNSETENV=0;
+  GNULIB_WCTOMB=0;
+    HAVE__EXIT=1;
+  HAVE_ATOLL=1;
+  HAVE_CANONICALIZE_FILE_NAME=1;
+  HAVE_DECL_GETLOADAVG=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_GRANTPT=1;
+  HAVE_MKDTEMP=1;
+  HAVE_MKOSTEMP=1;
+  HAVE_MKOSTEMPS=1;
+  HAVE_MKSTEMP=1;
+  HAVE_MKSTEMPS=1;
+  HAVE_POSIX_OPENPT=1;
+  HAVE_PTSNAME=1;
+  HAVE_PTSNAME_R=1;
+  HAVE_QSORT_R=1;
+  HAVE_RANDOM=1;
+  HAVE_RANDOM_H=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SECURE_GETENV=1;
+  HAVE_SETENV=1;
+  HAVE_DECL_SETENV=1;
+  HAVE_STRTOD=1;
+  HAVE_STRTOLL=1;
+  HAVE_STRTOULL=1;
+  HAVE_STRUCT_RANDOM_DATA=1;
+  HAVE_SYS_LOADAVG_H=0;
+  HAVE_UNLOCKPT=1;
+  HAVE_DECL_UNSETENV=1;
+  REPLACE_CALLOC=0;
+  REPLACE_CANONICALIZE_FILE_NAME=0;
+  REPLACE_MALLOC=0;
+  REPLACE_MBTOWC=0;
+  REPLACE_MKSTEMP=0;
+  REPLACE_PTSNAME=0;
+  REPLACE_PTSNAME_R=0;
+  REPLACE_PUTENV=0;
+  REPLACE_QSORT_R=0;
+  REPLACE_RANDOM_R=0;
+  REPLACE_REALLOC=0;
+  REPLACE_REALPATH=0;
+  REPLACE_SETENV=0;
+  REPLACE_STRTOD=0;
+  REPLACE_UNSETENV=0;
+  REPLACE_WCTOMB=0;
+
+
    if false; then
   GL_COND_LIBTOOL_TRUE=
   GL_COND_LIBTOOL_FALSE='#'
@@ -13797,99 +13826,6 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
-$as_echo_n "checking for __builtin_expect... " >&6; }
-if ${gl_cv___builtin_expect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-         int
-         main (int argc, char **argv)
-         {
-           argc = __builtin_expect (argc, 100);
-           return argv[argc != 100][0];
-         }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv___builtin_expect=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #include <builtins.h>
-             int
-             main (int argc, char **argv)
-             {
-               argc = __builtin_expect (argc, 100);
-               return argv[argc != 100][0];
-             }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv___builtin_expect="in <builtins.h>"
-else
-  gl_cv___builtin_expect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-$as_echo "$gl_cv___builtin_expect" >&6; }
-  if test "$gl_cv___builtin_expect" = yes; then
-    $as_echo "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
-
-  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    $as_echo "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
-
-  fi
-
-
-
-
-          if test "x$datarootdir" = x; then
-    datarootdir='${datadir}'
-
-  fi
-    if test "x$docdir" = x; then
-    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-
-  fi
-    if test "x$htmldir" = x; then
-    htmldir='${docdir}'
-
-  fi
-  if test "x$dvidir" = x; then
-    dvidir='${docdir}'
-
-  fi
-  if test "x$pdfdir" = x; then
-    pdfdir='${docdir}'
-
-  fi
-  if test "x$psdir" = x; then
-    psdir='${docdir}'
-
-  fi
-  if test "x$lispdir" = x; then
-    lispdir='${datarootdir}/emacs/site-lisp'
-
-  fi
-  if test "x$localedir" = x; then
-    localedir='${datarootdir}/locale'
-
-  fi
-    if test "x$runstatedir" = x; then
-    runstatedir='${localstatedir}/run'
-
-  fi
-
-      pkglibexecdir='${libexecdir}/${PACKAGE}'
-
-
 
 
 
@@ -13958,7 +13894,6 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
-
   gl_gettimeofday_timezone=void
   if test $ac_cv_func_gettimeofday != yes; then
     HAVE_GETTIMEOFDAY=0
@@ -14137,9 +14072,6 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
-  :
-
-
 
 
 
@@ -14384,16 +14316,6 @@ $as_echo "#define HAVE_INLINE 1" >>confdefs.h
 
 
 
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
-
-
-
-
-
-
-
-
-
   case "$host_os" in
     solaris*)
 
@@ -14630,17 +14552,6 @@ fi
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext"
-
-
-
-
-
-
-
-
-
-
 
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
@@ -15348,229 +15259,6 @@ $as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
-
-  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
-
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
-$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                     # Guess no on AIX and OSF/1.
-        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
-                     # Guess yes otherwise.
-        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
-      esac
-      if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
-    {
-      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
-        if (mbsinit (&state))
-          return 2;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_incomplete_state=yes
-else
-  gl_cv_func_mbrtowc_incomplete_state=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-      fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
-$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
-
-
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
-$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  case "$host_os" in
-                    # Guess no on Solaris 8.
-        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
-                    # Guess yes otherwise.
-        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
-      esac
-      if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int main ()
-{
-  /* This fails on Solaris 8:
-     mbrtowc returns 2, and sets wc to 0x00F0.
-     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
-    {
-      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-      mbstate_t state;
-      wchar_t wc;
-
-      memset (&state, '\0', sizeof (mbstate_t));
-      if (mbrtowc (&wc, input + 3, 6, &state) != 4
-          && mbtowc (&wc, input + 3, 6) == 4)
-        return 2;
-    }
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_mbrtowc_sanitycheck=yes
-else
-  gl_cv_func_mbrtowc_sanitycheck=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-      fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
-$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
-
-    REPLACE_MBSTATE_T=0
-    case "$gl_cv_func_mbrtowc_incomplete_state" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-    case "$gl_cv_func_mbrtowc_sanitycheck" in
-      *yes) ;;
-      *) REPLACE_MBSTATE_T=1 ;;
-    esac
-  else
-    REPLACE_MBSTATE_T=1
-  fi
-
-
-
-  if test $ac_cv_func_mbsinit = no; then
-    HAVE_MBSINIT=0
-    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-
-"
-if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT $ac_have_decl
-_ACEOF
-
-    if test $ac_cv_have_decl_mbsinit = yes; then
-                        REPLACE_MBSINIT=1
-    fi
-  else
-    if test $REPLACE_MBSTATE_T = 1; then
-      REPLACE_MBSINIT=1
-    else
-                        case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
-      esac
-    fi
-  fi
-
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_MBSINIT=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
-
-
-
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
 
@@ -15909,85 +15597,6 @@ $as_echo "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h
 
 
 
-
-  if false; then
-    REPLACE_MBTOWC=1
-  fi
-
-  if test $REPLACE_MBTOWC = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS mbtowc.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_MBTOWC=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
-
-
-
-
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
-
-
-  for ac_header in bp-sym.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
-if test "x$ac_cv_header_bp_sym_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BP_SYM_H 1
-_ACEOF
-
-fi
-
-done
-
-
-  fi
-
-
-
-
-
-          GNULIB_MEMCHR=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
 if ${gt_cv_ssize_t+:} false; then :
@@ -16375,127 +15984,6 @@ fi
       done
 
 
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdlib_h='<'stdlib.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
-$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-_ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdlib.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
-
-           gl_header=$gl_cv_absolute_stdlib_h
-           gl_cv_next_stdlib_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-$as_echo "$gl_cv_next_stdlib_h" >&6; }
-     fi
-     NEXT_STDLIB_H=$gl_cv_next_stdlib_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdlib.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdlib_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
-
-
-
-
-
-
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
-    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#if HAVE_SYS_LOADAVG_H
-# include <sys/loadavg.h>
-#endif
-#if HAVE_RANDOM_H
-# include <random.h>
-#endif
-
-int
-main ()
-{
-#undef $gl_func
-  (void) $gl_func;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Symbol=yes"
-else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
-
-                     eval ac_cv_have_decl_$gl_func=yes
-fi
-      done
-
-
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
@@ -17818,43 +17306,6 @@ $as_echo "#define GNULIB_TEST_WCTOB 1" >>confdefs.h
 
 
 
-  if false; then
-    REPLACE_WCTOMB=1
-  fi
-
-  if test $REPLACE_WCTOMB = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS wctomb.$ac_objext"
-
-
-  :
-
-  fi
-
-
-
-
-
-          GNULIB_WCTOMB=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_WCTOMB 1" >>confdefs.h
-
-
-
-
-
-
 
 
   if test $ac_cv_func_iswcntrl = yes; then
@@ -18215,6 +17666,693 @@ fi
       done
 
 
+  gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=false
+  gl_gnulib_enabled_configmake=false
+  gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false
+  gl_gnulib_enabled_localcharset=false
+  gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false
+  gl_gnulib_enabled_mbsinit=false
+  gl_gnulib_enabled_mbtowc=false
+  gl_gnulib_enabled_memchr=false
+  gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=false
+  gl_gnulib_enabled_stdlib=false
+  gl_gnulib_enabled_streq=false
+  gl_gnulib_enabled_strnlen1=false
+  gl_gnulib_enabled_verify=false
+  gl_gnulib_enabled_wctomb=false
+  gl_gnulib_enabled_wmemcpy=false
+  func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 ()
+  {
+    if ! $gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+$as_echo_n "checking for __builtin_expect... " >&6; }
+if ${gl_cv___builtin_expect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         int
+         main (int argc, char **argv)
+         {
+           argc = __builtin_expect (argc, 100);
+           return argv[argc != 100][0];
+         }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+             #include <builtins.h>
+             int
+             main (int argc, char **argv)
+             {
+               argc = __builtin_expect (argc, 100);
+               return argv[argc != 100][0];
+             }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv___builtin_expect="in <builtins.h>"
+else
+  gl_cv___builtin_expect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+$as_echo "$gl_cv___builtin_expect" >&6; }
+  if test "$gl_cv___builtin_expect" = yes; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+
+  elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
+    $as_echo "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+
+  fi
+
+
+      gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=true
+    fi
+  }
+  func_gl_gnulib_m4code_configmake ()
+  {
+    if ! $gl_gnulib_enabled_configmake; then
+
+          if test "x$datarootdir" = x; then
+    datarootdir='${datadir}'
+
+  fi
+    if test "x$docdir" = x; then
+    docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+
+  fi
+    if test "x$htmldir" = x; then
+    htmldir='${docdir}'
+
+  fi
+  if test "x$dvidir" = x; then
+    dvidir='${docdir}'
+
+  fi
+  if test "x$pdfdir" = x; then
+    pdfdir='${docdir}'
+
+  fi
+  if test "x$psdir" = x; then
+    psdir='${docdir}'
+
+  fi
+  if test "x$lispdir" = x; then
+    lispdir='${datarootdir}/emacs/site-lisp'
+
+  fi
+  if test "x$localedir" = x; then
+    localedir='${datarootdir}/locale'
+
+  fi
+    if test "x$runstatedir" = x; then
+    runstatedir='${localstatedir}/run'
+
+  fi
+
+      pkglibexecdir='${libexecdir}/${PACKAGE}'
+
+
+      gl_gnulib_enabled_configmake=true
+    fi
+  }
+  func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 ()
+  {
+    if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+
+  :
+
+      gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true
+    fi
+  }
+  func_gl_gnulib_m4code_localcharset ()
+  {
+    if ! $gl_gnulib_enabled_localcharset; then
+
+
+
+
+
+
+
+
+      LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+
+      gl_gnulib_enabled_localcharset=true
+      func_gl_gnulib_m4code_configmake
+    fi
+  }
+  func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 ()
+  {
+    if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then
+
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext"
+
+      gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=true
+    fi
+  }
+  func_gl_gnulib_m4code_mbsinit ()
+  {
+    if ! $gl_gnulib_enabled_mbsinit; then
+
+
+
+
+
+
+
+
+
+
+
+  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
+
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+      esac
+      if test $LOCALE_JA != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int main ()
+{
+  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+        if (mbsinit (&state))
+          return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_incomplete_state=yes
+else
+  gl_cv_func_mbrtowc_incomplete_state=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+
+
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                    # Guess no on Solaris 8.
+        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
+                    # Guess yes otherwise.
+        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
+      esac
+      if test $LOCALE_ZH_CN != none; then
+        if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int main ()
+{
+  /* This fails on Solaris 8:
+     mbrtowc returns 2, and sets wc to 0x00F0.
+     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
+  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+      mbstate_t state;
+      wchar_t wc;
+
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, input + 3, 6, &state) != 4
+          && mbtowc (&wc, input + 3, 6) == 4)
+        return 2;
+    }
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_sanitycheck=yes
+else
+  gl_cv_func_mbrtowc_sanitycheck=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+
+    REPLACE_MBSTATE_T=0
+    case "$gl_cv_func_mbrtowc_incomplete_state" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+    case "$gl_cv_func_mbrtowc_sanitycheck" in
+      *yes) ;;
+      *) REPLACE_MBSTATE_T=1 ;;
+    esac
+  else
+    REPLACE_MBSTATE_T=1
+  fi
+
+
+
+  if test $ac_cv_func_mbsinit = no; then
+    HAVE_MBSINIT=0
+    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
+"
+if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBSINIT $ac_have_decl
+_ACEOF
+
+    if test $ac_cv_have_decl_mbsinit = yes; then
+                        REPLACE_MBSINIT=1
+    fi
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSINIT=1
+    else
+                        case "$host_os" in
+        mingw*) REPLACE_MBSINIT=1 ;;
+      esac
+    fi
+  fi
+
+      if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext"
+
+
+  :
+
+      fi
+
+
+
+
+
+          GNULIB_MBSINIT=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+
+
+
+      gl_gnulib_enabled_mbsinit=true
+      if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+        func_gl_gnulib_m4code_verify
+      fi
+    fi
+  }
+  func_gl_gnulib_m4code_mbtowc ()
+  {
+    if ! $gl_gnulib_enabled_mbtowc; then
+
+
+
+  if false; then
+    REPLACE_MBTOWC=1
+  fi
+
+      if test $REPLACE_MBTOWC = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS mbtowc.$ac_objext"
+
+
+  :
+
+      fi
+
+
+
+
+
+          GNULIB_MBTOWC=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
+
+
+
+      gl_gnulib_enabled_mbtowc=true
+      func_gl_gnulib_m4code_stdlib
+    fi
+  }
+  func_gl_gnulib_m4code_memchr ()
+  {
+    if ! $gl_gnulib_enabled_memchr; then
+
+      if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext"
+
+
+  for ac_header in bp-sym.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
+if test "x$ac_cv_header_bp_sym_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BP_SYM_H 1
+_ACEOF
+
+fi
+
+done
+
+
+      fi
+
+
+
+
+
+          GNULIB_MEMCHR=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
+
+
+
+      gl_gnulib_enabled_memchr=true
+    fi
+  }
+  func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 ()
+  {
+    if ! $gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147; then
+      gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=true
+    fi
+  }
+  func_gl_gnulib_m4code_stdlib ()
+  {
+    if ! $gl_gnulib_enabled_stdlib; then
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdlib_h='<'stdlib.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
+if ${gl_cv_next_stdlib_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+_ACEOF
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdlib.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stdlib_h
+           gl_cv_next_stdlib_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+$as_echo "$gl_cv_next_stdlib_h" >&6; }
+     fi
+     NEXT_STDLIB_H=$gl_cv_next_stdlib_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdlib.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdlib_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
+
+
+
+
+
+
+    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval \${$as_gl_Symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#if HAVE_SYS_LOADAVG_H
+# include <sys/loadavg.h>
+#endif
+#if HAVE_RANDOM_H
+# include <random.h>
+#endif
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
+
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
+
+
+      gl_gnulib_enabled_stdlib=true
+      func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147
+    fi
+  }
+  func_gl_gnulib_m4code_streq ()
+  {
+    if ! $gl_gnulib_enabled_streq; then
+      gl_gnulib_enabled_streq=true
+    fi
+  }
+  func_gl_gnulib_m4code_strnlen1 ()
+  {
+    if ! $gl_gnulib_enabled_strnlen1; then
+      gl_gnulib_enabled_strnlen1=true
+      func_gl_gnulib_m4code_memchr
+    fi
+  }
+  func_gl_gnulib_m4code_verify ()
+  {
+    if ! $gl_gnulib_enabled_verify; then
+      gl_gnulib_enabled_verify=true
+    fi
+  }
+  func_gl_gnulib_m4code_wctomb ()
+  {
+    if ! $gl_gnulib_enabled_wctomb; then
+
+
+
+  if false; then
+    REPLACE_WCTOMB=1
+  fi
+
+      if test $REPLACE_WCTOMB = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS wctomb.$ac_objext"
+
+
+  :
+
+      fi
+
+
+
+
+
+          GNULIB_WCTOMB=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_WCTOMB 1" >>confdefs.h
+
+
+
+      gl_gnulib_enabled_wctomb=true
+      func_gl_gnulib_m4code_stdlib
+    fi
+  }
+  func_gl_gnulib_m4code_wmemcpy ()
+  {
+    if ! $gl_gnulib_enabled_wmemcpy; then
 
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmemcpy" >&5
@@ -18257,7 +18395,7 @@ $as_echo "$gl_cv_func_wmemcpy" >&6; }
     HAVE_WMEMCPY=0
   fi
 
-  if test $HAVE_WMEMCPY = 0; then
+      if test $HAVE_WMEMCPY = 0; then
 
 
 
@@ -18268,7 +18406,7 @@ $as_echo "$gl_cv_func_wmemcpy" >&6; }
 
   gl_LIBOBJS="$gl_LIBOBJS wmemcpy.$ac_objext"
 
-  fi
+      fi
 
 
 
@@ -18284,6 +18422,169 @@ $as_echo "#define GNULIB_TEST_WMEMCPY 1" >>confdefs.h
 
 
 
+      gl_gnulib_enabled_wmemcpy=true
+    fi
+  }
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    func_gl_gnulib_m4code_mbtowc
+  fi
+  if test $NEED_LOCALTIME_BUFFER = 1; then
+    func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_localcharset
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_mbsinit
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_streq
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_verify
+  fi
+  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
+    func_gl_gnulib_m4code_strnlen1
+  fi
+  if test $REPLACE_STRSTR = 1; then
+    func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547
+  fi
+  if test $REPLACE_STRSTR = 1; then
+    func_gl_gnulib_m4code_memchr
+  fi
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    func_gl_gnulib_m4code_mbsinit
+  fi
+  if test $HAVE_WCSDUP = 0; then
+    func_gl_gnulib_m4code_wmemcpy
+  fi
+  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
+    func_gl_gnulib_m4code_wctomb
+  fi
+
+   if $gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547; then
+  gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_TRUE=
+  gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_FALSE='#'
+else
+  gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_TRUE='#'
+  gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_FALSE=
+fi
+
+   if $gl_gnulib_enabled_configmake; then
+  gl_GNULIB_ENABLED_configmake_TRUE=
+  gl_GNULIB_ENABLED_configmake_FALSE='#'
+else
+  gl_GNULIB_ENABLED_configmake_TRUE='#'
+  gl_GNULIB_ENABLED_configmake_FALSE=
+fi
+
+   if $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+  gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE=
+  gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE='#'
+else
+  gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE='#'
+  gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE=
+fi
+
+   if $gl_gnulib_enabled_localcharset; then
+  gl_GNULIB_ENABLED_localcharset_TRUE=
+  gl_GNULIB_ENABLED_localcharset_FALSE='#'
+else
+  gl_GNULIB_ENABLED_localcharset_TRUE='#'
+  gl_GNULIB_ENABLED_localcharset_FALSE=
+fi
+
+   if $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then
+  gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_TRUE=
+  gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_FALSE='#'
+else
+  gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_TRUE='#'
+  gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_FALSE=
+fi
+
+   if $gl_gnulib_enabled_mbsinit; then
+  gl_GNULIB_ENABLED_mbsinit_TRUE=
+  gl_GNULIB_ENABLED_mbsinit_FALSE='#'
+else
+  gl_GNULIB_ENABLED_mbsinit_TRUE='#'
+  gl_GNULIB_ENABLED_mbsinit_FALSE=
+fi
+
+   if $gl_gnulib_enabled_mbtowc; then
+  gl_GNULIB_ENABLED_mbtowc_TRUE=
+  gl_GNULIB_ENABLED_mbtowc_FALSE='#'
+else
+  gl_GNULIB_ENABLED_mbtowc_TRUE='#'
+  gl_GNULIB_ENABLED_mbtowc_FALSE=
+fi
+
+   if $gl_gnulib_enabled_memchr; then
+  gl_GNULIB_ENABLED_memchr_TRUE=
+  gl_GNULIB_ENABLED_memchr_FALSE='#'
+else
+  gl_GNULIB_ENABLED_memchr_TRUE='#'
+  gl_GNULIB_ENABLED_memchr_FALSE=
+fi
+
+   if $gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147; then
+  gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_TRUE=
+  gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_FALSE='#'
+else
+  gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_TRUE='#'
+  gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_FALSE=
+fi
+
+   if $gl_gnulib_enabled_stdlib; then
+  gl_GNULIB_ENABLED_stdlib_TRUE=
+  gl_GNULIB_ENABLED_stdlib_FALSE='#'
+else
+  gl_GNULIB_ENABLED_stdlib_TRUE='#'
+  gl_GNULIB_ENABLED_stdlib_FALSE=
+fi
+
+   if $gl_gnulib_enabled_streq; then
+  gl_GNULIB_ENABLED_streq_TRUE=
+  gl_GNULIB_ENABLED_streq_FALSE='#'
+else
+  gl_GNULIB_ENABLED_streq_TRUE='#'
+  gl_GNULIB_ENABLED_streq_FALSE=
+fi
+
+   if $gl_gnulib_enabled_strnlen1; then
+  gl_GNULIB_ENABLED_strnlen1_TRUE=
+  gl_GNULIB_ENABLED_strnlen1_FALSE='#'
+else
+  gl_GNULIB_ENABLED_strnlen1_TRUE='#'
+  gl_GNULIB_ENABLED_strnlen1_FALSE=
+fi
+
+   if $gl_gnulib_enabled_verify; then
+  gl_GNULIB_ENABLED_verify_TRUE=
+  gl_GNULIB_ENABLED_verify_FALSE='#'
+else
+  gl_GNULIB_ENABLED_verify_TRUE='#'
+  gl_GNULIB_ENABLED_verify_FALSE=
+fi
+
+   if $gl_gnulib_enabled_wctomb; then
+  gl_GNULIB_ENABLED_wctomb_TRUE=
+  gl_GNULIB_ENABLED_wctomb_FALSE='#'
+else
+  gl_GNULIB_ENABLED_wctomb_TRUE='#'
+  gl_GNULIB_ENABLED_wctomb_FALSE=
+fi
+
+   if $gl_gnulib_enabled_wmemcpy; then
+  gl_GNULIB_ENABLED_wmemcpy_TRUE=
+  gl_GNULIB_ENABLED_wmemcpy_FALSE='#'
+else
+  gl_GNULIB_ENABLED_wmemcpy_TRUE='#'
+  gl_GNULIB_ENABLED_wmemcpy_FALSE=
+fi
+
   # End of code from modules
 
 
@@ -18318,6 +18619,7 @@ $as_echo "#define GNULIB_TEST_WMEMCPY 1" >>confdefs.h
 
 
 
+
   LIBGNU_LIBDEPS="$gl_libdeps"
 
   LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
@@ -19698,6 +20000,66 @@ fi
 if test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_FALSE}"; then
   as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_TRUE}" && test -z "${gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_configmake_TRUE}" && test -z "${gl_GNULIB_ENABLED_configmake_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_configmake\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE}" && test -z "${gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_localcharset_TRUE}" && test -z "${gl_GNULIB_ENABLED_localcharset_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_localcharset\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_TRUE}" && test -z "${gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_mbsinit_TRUE}" && test -z "${gl_GNULIB_ENABLED_mbsinit_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_mbsinit\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_mbtowc_TRUE}" && test -z "${gl_GNULIB_ENABLED_mbtowc_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_mbtowc\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_memchr_TRUE}" && test -z "${gl_GNULIB_ENABLED_memchr_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_memchr\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_TRUE}" && test -z "${gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_stdlib_TRUE}" && test -z "${gl_GNULIB_ENABLED_stdlib_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_stdlib\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_streq_TRUE}" && test -z "${gl_GNULIB_ENABLED_streq_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_streq\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_strnlen1_TRUE}" && test -z "${gl_GNULIB_ENABLED_strnlen1_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_strnlen1\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_verify_TRUE}" && test -z "${gl_GNULIB_ENABLED_verify_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_verify\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_wctomb_TRUE}" && test -z "${gl_GNULIB_ENABLED_wctomb_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_wctomb\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_wmemcpy_TRUE}" && test -z "${gl_GNULIB_ENABLED_wmemcpy_FALSE}"; then
+  as_fn_error $? "conditional \"gl_GNULIB_ENABLED_wmemcpy\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
     gl_libobjs=
@@ -20128,7 +20490,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Star Traders $as_me 7.10-pre2, which was
+This file was extended by Star Traders $as_me 7.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20195,7 +20557,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Star Traders config.status 7.10-pre2
+Star Traders config.status 7.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/data/Makefile.in b/data/Makefile.in
index e3a6edd..4d6dd3c 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -128,15 +128,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -146,14 +145,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
diff --git a/data/trader.desktop b/data/trader.desktop
index a46dba3..7378974 100644
--- a/data/trader.desktop
+++ b/data/trader.desktop
@@ -1,4 +1,24 @@
+#########################################################################
+#                                                                       #
+#             Star Traders: A Game of Interstellar Trading              #
+#                Copyright (C) 1990-2017, John Zaitseff                 #
+#                                                                       #
+#########################################################################
+
+# Author: John Zaitseff <J.Zaitseff@zap.org.au>
+# $Id: 6fa6bec365e5b1e17b2eaebf3a9843aa5c451e22 $
+
+# This file provides a translated desktop entry for Star Traders and
+# conforms to the Desktop Entry Specification v1.1.
+#
+# This file is distributed under the same licence as Star Traders itself:
+# the GNU General Public License, version 3 or later.
+
 [Desktop Entry]
+# TRANSLATORS: The name of the game.  You may choose to translate it into
+# your own language (recommended) or keep it the same as the English
+# version.  Feel free to look through other translations to see how
+# others have done this.
 Name[en@quot]=Star Traders
 Name[en_AU]=Star Traders
 Name[en_CA]=Star Traders
@@ -33,13 +53,25 @@ Comment[ru]=Играть в «Звёздные торговцы», просту
 Comment[sr]=Играјте Звездане трговце, једноставну игру међузвезданог трговања
 Comment[sv]=Spela Star Traders, ett enkelt spel om interstellär handel
 Comment=Play Star Traders, a simple game of interstellar trading
+# TRANSLATORS: A list of keywords describing Star Traders.  By all means
+# add your own keywords!
 Keywords[en@quot]=game;interstellar;trading;strategy;
 Keywords[en_AU]=game;interstellar;trading;strategy;
 Keywords[en_CA]=game;interstellar;trading;strategy;
 Keywords[en_GB]=game;interstellar;trading;strategy;
 Keywords[en_US]=game;interstellar;trading;strategy;
+Keywords[da]=spil;interstellar;handel;strategi;
+Keywords[de]=spiel;universum;galaxie;handel;strategie;
+Keywords[fr]=jeu;interstellaire;commerce;stratégie;
+Keywords[hu]=játék;csillagközi;kereskedés;stratégia;
+Keywords[nb]=spill;interstellar;handel;strategi;
 Keywords[ru]=игра;межзвёздная;торговля;стратегия;
+Keywords[sv]=spel;interstellär;handel;strategi;
 Keywords=game;interstellar;trading;strategy;
+# TRANSLATORS: This string is the name of the icon to use.  The Desktop
+# Entry Specification states it is translatable, but unless you provide a
+# matching icon, please leave it as "trader": this will use trader.svg
+# and the various trader.png files in the data source code directory.
 Icon[en@quot]=trader
 Icon[en_AU]=trader
 Icon[en_CA]=trader
diff --git a/doc/Makefile.in b/doc/Makefile.in
index eeabb5c..04738ed 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -127,15 +127,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -145,14 +144,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 307fe2a..b1a0a8b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
 
@@ -81,6 +81,7 @@ libgnu_a_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c
 
 ## begin gnulib module configmake
 
+if gl_GNULIB_ENABLED_configmake
 # Listed in the same order as the GNU makefile conventions, and
 # provided by autoconf 2.59c+ or 2.70.
 # The Automake-defined pkg* macros are appended, in the order
@@ -122,6 +123,7 @@ configmake.h: Makefile
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
 
+endif
 ## end   gnulib module configmake
 
 ## begin gnulib module crc
@@ -168,23 +170,6 @@ EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
 ## end   gnulib module getopt-posix
 
-## begin gnulib module gettext
-
-# If your project uses "gettextize --intl" to put a source-code
-# copy of libintl into the package, every Makefile.am needs
-# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# Here's one way to do this:
-#AM_CPPFLAGS += -I$(top_builddir)/intl
-# This option has no effect when the user disables NLS (because then
-# the intl directory contains no libintl.h file).  This option is not
-# enabled by default because the intl directory might not exist if
-# your project does not use "gettext --intl", and some compilers
-# complain about -I options applied to nonexistent directories.
-
-EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
-
-## end   gnulib module gettext
-
 ## begin gnulib module gettext-h
 
 libgnu_a_SOURCES += gettext.h
@@ -211,8 +196,10 @@ V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## begin gnulib module hard-locale
 
+if gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76
 libgnu_a_SOURCES += hard-locale.c
 
+endif
 EXTRA_DIST += hard-locale.h
 
 ## end   gnulib module hard-locale
@@ -318,6 +305,7 @@ EXTRA_DIST += limits.in.h
 
 ## begin gnulib module localcharset
 
+if gl_GNULIB_ENABLED_localcharset
 libgnu_a_SOURCES += localcharset.h localcharset.c
 
 # We need the following in order to install a simple file in $(libdir)
@@ -386,6 +374,7 @@ SUFFIXES += .sed .sin
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
 
+endif
 EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
 ## end   gnulib module localcharset
@@ -427,7 +416,9 @@ EXTRA_DIST += locale.in.h
 
 ## begin gnulib module localtime-buffer
 
+if gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9
 
+endif
 EXTRA_DIST += localtime-buffer.c localtime-buffer.h
 
 EXTRA_libgnu_a_SOURCES += localtime-buffer.c
@@ -445,7 +436,9 @@ EXTRA_libgnu_a_SOURCES += mbrtowc.c
 
 ## begin gnulib module mbsinit
 
+if gl_GNULIB_ENABLED_mbsinit
 
+endif
 EXTRA_DIST += mbsinit.c
 
 EXTRA_libgnu_a_SOURCES += mbsinit.c
@@ -463,7 +456,9 @@ EXTRA_libgnu_a_SOURCES += mbsrtowcs-state.c mbsrtowcs.c
 
 ## begin gnulib module mbtowc
 
+if gl_GNULIB_ENABLED_mbtowc
 
+endif
 EXTRA_DIST += mbtowc-impl.h mbtowc.c
 
 EXTRA_libgnu_a_SOURCES += mbtowc.c
@@ -472,7 +467,9 @@ EXTRA_libgnu_a_SOURCES += mbtowc.c
 
 ## begin gnulib module memchr
 
+if gl_GNULIB_ENABLED_memchr
 
+endif
 EXTRA_DIST += memchr.c memchr.valgrind
 
 EXTRA_libgnu_a_SOURCES += memchr.c
@@ -481,12 +478,14 @@ EXTRA_libgnu_a_SOURCES += memchr.c
 
 ## begin gnulib module snippet/_Noreturn
 
+if gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147
 # Because this Makefile snippet defines a variable used by other
 # gnulib Makefile snippets, it must be present in all makefiles that
 # need it. This is ensured by the applicability 'all' defined above.
 
 _NORETURN_H=$(srcdir)/_Noreturn.h
 
+endif
 EXTRA_DIST += _Noreturn.h
 
 ## end   gnulib module snippet/_Noreturn
@@ -775,6 +774,7 @@ EXTRA_DIST += stdio.in.h
 
 ## begin gnulib module stdlib
 
+if gl_GNULIB_ENABLED_stdlib
 BUILT_SOURCES += stdlib.h
 
 # We need the following in order to create <stdlib.h> when the system
@@ -875,13 +875,16 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
+endif
 EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
 ## begin gnulib module streq
 
+if gl_GNULIB_ENABLED_streq
 
+endif
 EXTRA_DIST += streq.h
 
 ## end   gnulib module streq
@@ -996,8 +999,10 @@ EXTRA_DIST += string.in.h
 
 ## begin gnulib module strnlen1
 
+if gl_GNULIB_ENABLED_strnlen1
 libgnu_a_SOURCES += strnlen1.h strnlen1.c
 
+endif
 ## end   gnulib module strnlen1
 
 ## begin gnulib module strstr-simple
@@ -1395,7 +1400,9 @@ EXTRA_DIST += unitypes.in.h
 
 ## begin gnulib module verify
 
+if gl_GNULIB_ENABLED_verify
 
+endif
 EXTRA_DIST += verify.h
 
 ## end   gnulib module verify
@@ -1555,7 +1562,9 @@ EXTRA_libgnu_a_SOURCES += wctob.c
 
 ## begin gnulib module wctomb
 
+if gl_GNULIB_ENABLED_wctomb
 
+endif
 EXTRA_DIST += wctomb-impl.h wctomb.c
 
 EXTRA_libgnu_a_SOURCES += wctomb.c
@@ -1606,7 +1615,9 @@ EXTRA_DIST += wctype.in.h
 
 ## begin gnulib module wmemcpy
 
+if gl_GNULIB_ENABLED_wmemcpy
 
+endif
 EXTRA_DIST += wmemcpy-impl.h wmemcpy.c
 
 EXTRA_libgnu_a_SOURCES += wmemcpy.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6f8f36a..1578216 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -35,7 +35,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h crc getopt-gnu gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 
 
@@ -112,8 +112,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_1 = unistr/u8-mbtoucr.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_2 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
+@gl_GNULIB_ENABLED_configmake_TRUE@am__append_1 = configmake.h
+@gl_GNULIB_ENABLED_configmake_TRUE@am__append_2 = configmake.h configmake.h-t
+@gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE@am__append_3 = hard-locale.c
+@gl_GNULIB_ENABLED_localcharset_TRUE@am__append_4 = localcharset.h localcharset.c
+@gl_GNULIB_ENABLED_localcharset_TRUE@am__append_5 = .sed .sin
+@gl_GNULIB_ENABLED_localcharset_TRUE@am__append_6 = charset.alias ref-add.sed ref-del.sed
+@gl_GNULIB_ENABLED_stdlib_TRUE@am__append_7 = stdlib.h
+@gl_GNULIB_ENABLED_stdlib_TRUE@am__append_8 = stdlib.h stdlib.h-t
+@gl_GNULIB_ENABLED_strnlen1_TRUE@am__append_9 = strnlen1.h strnlen1.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_10 = unistr/u8-mbtoucr.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_11 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
@@ -127,15 +136,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -145,14 +153,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
@@ -181,14 +187,18 @@ am__libgnu_a_SOURCES_DIST = c-ctype.h c-ctype.c c-strcase.h \
 	localcharset.h localcharset.c striconv.h striconv.c strnlen1.h \
 	strnlen1.c unistd.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \
 	unistr/u8-uctomb-aux.c wctype-h.c
+@gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE@am__objects_1 = hard-locale.$(OBJEXT)
+@gl_GNULIB_ENABLED_localcharset_TRUE@am__objects_2 =  \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	localcharset.$(OBJEXT)
+@gl_GNULIB_ENABLED_strnlen1_TRUE@am__objects_3 = strnlen1.$(OBJEXT)
 am__dirstamp = $(am__leading_dot)dirstamp
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT)
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_4 = unistr/u8-mbtoucr.$(OBJEXT)
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_5 = unistr/u8-uctomb.$(OBJEXT) \
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/u8-uctomb-aux.$(OBJEXT)
 am_libgnu_a_OBJECTS = c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \
-	c-strncasecmp.$(OBJEXT) crc.$(OBJEXT) hard-locale.$(OBJEXT) \
-	localcharset.$(OBJEXT) striconv.$(OBJEXT) strnlen1.$(OBJEXT) \
-	unistd.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+	c-strncasecmp.$(OBJEXT) crc.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) striconv.$(OBJEXT) $(am__objects_3) \
+	unistd.$(OBJEXT) $(am__objects_4) $(am__objects_5) \
 	wctype-h.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -1092,21 +1102,9 @@ SUBDIRS =
 noinst_HEADERS = 
 noinst_LIBRARIES = libgnu.a
 noinst_LTLIBRARIES = 
-
-# If your project uses "gettextize --intl" to put a source-code
-# copy of libintl into the package, every Makefile.am needs
-# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# Here's one way to do this:
-#AM_CPPFLAGS += -I$(top_builddir)/intl
-# This option has no effect when the user disables NLS (because then
-# the intl directory contains no libintl.h file).  This option is not
-# enabled by default because the intl directory might not exist if
-# your project does not use "gettext --intl", and some compilers
-# complain about -I options applied to nonexistent directories.
 EXTRA_DIST = btowc.c crc.h getopt-cdefs.in.h getopt-core.h \
 	getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c \
-	getopt.in.h getopt1.c getopt_int.h \
-	$(top_srcdir)/build-aux/config.rpath gettimeofday.c \
+	getopt.in.h getopt1.c getopt_int.h gettimeofday.c \
 	hard-locale.h $(top_srcdir)/build-aux/config.rpath iconv.in.h \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
@@ -1123,27 +1121,26 @@ EXTRA_DIST = btowc.c crc.h getopt-cdefs.in.h getopt-core.h \
 	sys_types.in.h time.in.h unistd.in.h unistr.in.h unitypes.in.h \
 	verify.h wchar.in.h wcrtomb.c wcsdup-impl.h wcsdup.c wctob.c \
 	wctomb-impl.h wctomb.c wctype.in.h wmemcpy-impl.h wmemcpy.c
-BUILT_SOURCES = configmake.h $(GETOPT_H) $(GETOPT_CDEFS_H) $(ICONV_H) \
-	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
-	iconv_open-osf.h iconv_open-solaris.h $(LIMITS_H) locale.h \
-	$(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \
-	sys/stat.h sys/time.h sys/types.h time.h unistd.h \
-	$(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) wchar.h \
-	wctype.h
-SUFFIXES = .sed .sin
+BUILT_SOURCES = $(am__append_1) $(GETOPT_H) $(GETOPT_CDEFS_H) \
+	$(ICONV_H) iconv_open-aix.h iconv_open-hpux.h \
+	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \
+	$(LIMITS_H) locale.h $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \
+	stdio.h $(am__append_7) string.h sys/stat.h sys/time.h \
+	sys/types.h time.h unistd.h $(LIBUNISTRING_UNISTR_H) \
+	$(LIBUNISTRING_UNITYPES_H) wchar.h wctype.h
+SUFFIXES = $(am__append_5)
 MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t getopt-cdefs.h \
 	getopt-cdefs.h-t iconv.h iconv.h-t iconv_open-aix.h-t \
 	iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t \
 	iconv_open-solaris.h-t limits.h limits.h-t locale.h locale.h-t \
 	stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t \
-	stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \
+	stdio.h stdio.h-t $(am__append_8) string.h string.h-t \
 	sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t sys/types.h \
 	sys/types.h-t time.h time.h-t unistd.h unistd.h-t unistr.h \
 	unistr.h-t unitypes.h unitypes.h-t wchar.h wchar.h-t wctype.h \
 	wctype.h-t
 MOSTLYCLEANDIRS = sys
-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
-	ref-del.sed
+CLEANFILES = $(am__append_2) $(am__append_6)
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \
 	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
@@ -1151,9 +1148,9 @@ MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \
 AM_CPPFLAGS = 
 AM_CFLAGS = 
 libgnu_a_SOURCES = c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \
-	c-strncasecmp.c crc.c gettext.h hard-locale.c localcharset.h \
-	localcharset.c striconv.h striconv.c strnlen1.h strnlen1.c \
-	unistd.c $(am__append_1) $(am__append_2) wctype-h.c
+	c-strncasecmp.c crc.c gettext.h $(am__append_3) \
+	$(am__append_4) striconv.h striconv.c $(am__append_9) unistd.c \
+	$(am__append_10) $(am__append_11) wctype-h.c
 libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES = btowc.c getopt.c getopt1.c gettimeofday.c \
@@ -1170,13 +1167,13 @@ GPERF = gperf
 V_GPERF = $(V_GPERF_@AM_V@)
 V_GPERF_ = $(V_GPERF_@AM_DEFAULT_V@)
 V_GPERF_0 = @echo "  GPERF   " $@;
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+@gl_GNULIB_ENABLED_localcharset_TRUE@charset_alias = $(DESTDIR)$(libdir)/charset.alias
+@gl_GNULIB_ENABLED_localcharset_TRUE@charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 
 # Because this Makefile snippet defines a variable used by other
 # gnulib Makefile snippets, it must be present in all makefiles that
 # need it. This is ensured by the applicability 'all' defined above.
-_NORETURN_H = $(srcdir)/_Noreturn.h
+@gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147_TRUE@_NORETURN_H = $(srcdir)/_Noreturn.h
 
 # Because this Makefile snippet defines a variable used by other
 # gnulib Makefile snippets, it must be present in all makefiles that
@@ -1477,6 +1474,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+@gl_GNULIB_ENABLED_localcharset_FALSE@all-local:
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
 installdirs: installdirs-recursive
 installdirs-am:
@@ -1518,6 +1516,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local:
+@gl_GNULIB_ENABLED_localcharset_FALSE@uninstall-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
@@ -1614,39 +1614,39 @@ uninstall-am: uninstall-local
 # provided by autoconf 2.59c+ or 2.70.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
-configmake.h: Makefile
-	$(AM_V_GEN)rm -f $@-t && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  echo '#define PREFIX "$(prefix)"'; \
-	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
-	  echo '#define BINDIR "$(bindir)"'; \
-	  echo '#define SBINDIR "$(sbindir)"'; \
-	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
-	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
-	  echo '#define DATADIR "$(datadir)"'; \
-	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
-	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
-	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
-	  echo '#define INCLUDEDIR "$(includedir)"'; \
-	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
-	  echo '#define DOCDIR "$(docdir)"'; \
-	  echo '#define INFODIR "$(infodir)"'; \
-	  echo '#define HTMLDIR "$(htmldir)"'; \
-	  echo '#define DVIDIR "$(dvidir)"'; \
-	  echo '#define PDFDIR "$(pdfdir)"'; \
-	  echo '#define PSDIR "$(psdir)"'; \
-	  echo '#define LIBDIR "$(libdir)"'; \
-	  echo '#define LISPDIR "$(lispdir)"'; \
-	  echo '#define LOCALEDIR "$(localedir)"'; \
-	  echo '#define MANDIR "$(mandir)"'; \
-	  echo '#define MANEXT "$(manext)"'; \
-	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
-	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
-	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
-	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
-	} | sed '/""/d' > $@-t && \
-	mv -f $@-t $@
+@gl_GNULIB_ENABLED_configmake_TRUE@configmake.h: Makefile
+@gl_GNULIB_ENABLED_configmake_TRUE@	$(AM_V_GEN)rm -f $@-t && \
+@gl_GNULIB_ENABLED_configmake_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PREFIX "$(prefix)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define BINDIR "$(bindir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define SBINDIR "$(sbindir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define DATADIR "$(datadir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define INCLUDEDIR "$(includedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define DOCDIR "$(docdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define INFODIR "$(infodir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define HTMLDIR "$(htmldir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define DVIDIR "$(dvidir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PDFDIR "$(pdfdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PSDIR "$(psdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define LIBDIR "$(libdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define LISPDIR "$(lispdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define LOCALEDIR "$(localedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define MANDIR "$(mandir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define MANEXT "$(manext)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+@gl_GNULIB_ENABLED_configmake_TRUE@	} | sed '/""/d' > $@-t && \
+@gl_GNULIB_ENABLED_configmake_TRUE@	mv -f $@-t $@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
@@ -1735,57 +1735,57 @@ iconv_open-solaris.h: iconv_open-solaris.gperf
 # On systems with glibc-2.1 or newer, the file is redundant, therefore we
 # avoid installing it.
 
-all-local: charset.alias ref-add.sed ref-del.sed
-install-exec-local: install-exec-localcharset
-install-exec-localcharset: all-local
-	if test $(GLIBC21) = no; then \
-	  case '$(host_os)' in \
-	    darwin[56]*) \
-	      need_charset_alias=true ;; \
-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-	      need_charset_alias=false ;; \
-	    *) \
-	      need_charset_alias=true ;; \
-	  esac ; \
-	else \
-	  need_charset_alias=false ; \
-	fi ; \
-	if $$need_charset_alias; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-	fi ; \
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if $$need_charset_alias; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
+@gl_GNULIB_ENABLED_localcharset_TRUE@all-local: charset.alias ref-add.sed ref-del.sed
+@gl_GNULIB_ENABLED_localcharset_TRUE@install-exec-local: install-exec-localcharset
+@gl_GNULIB_ENABLED_localcharset_TRUE@install-exec-localcharset: all-local
+@gl_GNULIB_ENABLED_localcharset_TRUE@	if test $(GLIBC21) = no; then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  case '$(host_os)' in \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    darwin[56]*) \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	      need_charset_alias=true ;; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	      need_charset_alias=false ;; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    *) \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	      need_charset_alias=true ;; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  esac ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	else \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  need_charset_alias=false ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	fi ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	if $$need_charset_alias; then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	fi ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	if test -f $(charset_alias); then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  rm -f $(charset_tmp) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	else \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  if $$need_charset_alias; then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    rm -f $(charset_tmp) ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  fi ; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	fi
 
-uninstall-local: uninstall-localcharset
-uninstall-localcharset: all-local
-	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
+@gl_GNULIB_ENABLED_localcharset_TRUE@uninstall-local: uninstall-localcharset
+@gl_GNULIB_ENABLED_localcharset_TRUE@uninstall-localcharset: all-local
+@gl_GNULIB_ENABLED_localcharset_TRUE@	if test -f $(charset_alias); then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	      > /dev/null; then \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    rm -f $(charset_alias); \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  else \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  fi; \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	  rm -f $(charset_tmp); \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	fi
 
-charset.alias: config.charset
-	$(AM_V_GEN)rm -f t-$@ $@ && \
-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
-	mv t-$@ $@
-.sin.sed:
-	$(AM_V_GEN)rm -f t-$@ $@ && \
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
-	mv t-$@ $@
+@gl_GNULIB_ENABLED_localcharset_TRUE@charset.alias: config.charset
+@gl_GNULIB_ENABLED_localcharset_TRUE@	$(AM_V_GEN)rm -f t-$@ $@ && \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	mv t-$@ $@
+@gl_GNULIB_ENABLED_localcharset_TRUE@.sin.sed:
+@gl_GNULIB_ENABLED_localcharset_TRUE@	$(AM_V_GEN)rm -f t-$@ $@ && \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
+@gl_GNULIB_ENABLED_localcharset_TRUE@	mv t-$@ $@
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
@@ -2004,100 +2004,100 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
-	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
-	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
-	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
-	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
-	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
-	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
-	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
-	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
-	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
-	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
-	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
-	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
-	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
-	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
-	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
-	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
-	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
-	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
-	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
-	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
-	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
-	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
-	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
-	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
-	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
-	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
-	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
-	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
-	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
-	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
-	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
-	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
-	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
-	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
-	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
-	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
-	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
-	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
-	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-	} > $@-t && \
-	mv $@-t $@
+@gl_GNULIB_ENABLED_stdlib_TRUE@stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
+@gl_GNULIB_ENABLED_stdlib_TRUE@  $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+@gl_GNULIB_ENABLED_stdlib_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      < $(srcdir)/stdlib.in.h | \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	} > $@-t && \
+@gl_GNULIB_ENABLED_stdlib_TRUE@	mv $@-t $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index ab1d8d2..299bdc6 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -127,15 +127,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -145,14 +144,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
diff --git a/m4/gettext.m4 b/m4/gettext.m4
deleted file mode 100644
index eef5073..0000000
--- a/m4/gettext.m4
+++ /dev/null
@@ -1,420 +0,0 @@
-# gettext.m4 serial 68 (gettext-0.19.8)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST([DATADIRNAME])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST([INSTOBJEXT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST([GENCAT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST([INTLOBJS])
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-
-dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
deleted file mode 100644
index 926edba..0000000
--- a/m4/glibc2.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-# glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.0 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([gt_GLIBC2],
-  [
-    AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
-      [ac_cv_gnu_library_2],
-      [AC_EGREP_CPP([Lucky GNU user],
-        [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-  Lucky GNU user
- #endif
-#endif
-        ],
-        [ac_cv_gnu_library_2=yes],
-        [ac_cv_gnu_library_2=no])
-      ]
-    )
-    AC_SUBST([GLIBC2])
-    GLIBC2="$ac_cv_gnu_library_2"
-  ]
-)
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index dedb5eb..d953a24 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -56,7 +56,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module extern-inline:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
-  # Code from module gettext:
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
@@ -137,9 +136,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_BTOWC
   fi
   gl_WCHAR_MODULE_INDICATOR([btowc])
-  gl___BUILTIN_EXPECT
   gl_CONFIG_H
-  gl_CONFIGMAKE_PREP
   AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FUNC_GETOPT_GNU
   dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required
@@ -153,8 +150,6 @@ AC_DEFUN([gl_INIT],
     GNULIB_GL_UNISTD_H_GETOPT=1
   fi
   AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
-  dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
-  AM_GNU_GETTEXT_VERSION([0.18.1])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   gl_FUNC_GETTIMEOFDAY
@@ -163,7 +158,6 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
-  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -178,24 +172,13 @@ AC_DEFUN([gl_INIT],
   fi
   gl_INLINE
   gl_LIMITS_H
-  gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
-  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
   gl_LOCALE_H
-  AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
-  AC_LIBOBJ([localtime-buffer])
   gl_FUNC_MBRTOWC
   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
     AC_LIBOBJ([mbrtowc])
     gl_PREREQ_MBRTOWC
   fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
-  gl_FUNC_MBSINIT
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
-    gl_PREREQ_MBSINIT
-  fi
-  gl_WCHAR_MODULE_INDICATOR([mbsinit])
   gl_FUNC_MBSRTOWCS
   if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
     AC_LIBOBJ([mbsrtowcs])
@@ -203,25 +186,12 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_MBSRTOWCS
   fi
   gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
-  gl_FUNC_MBTOWC
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
-  gl_STDLIB_MODULE_INDICATOR([mbtowc])
-  gl_FUNC_MEMCHR
-  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
-    AC_LIBOBJ([memchr])
-    gl_PREREQ_MEMCHR
-  fi
-  gl_STRING_MODULE_INDICATOR([memchr])
   gl_MULTIARCH
   gt_TYPE_SSIZE_T
   AM_STDBOOL_H
   gl_STDDEF_H
   gl_STDINT_H
   gl_STDIO_H
-  gl_STDLIB_H
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
@@ -268,18 +238,213 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_WCTOB
   fi
   gl_WCHAR_MODULE_INDICATOR([wctob])
-  gl_FUNC_WCTOMB
-  if test $REPLACE_WCTOMB = 1; then
-    AC_LIBOBJ([wctomb])
-    gl_PREREQ_WCTOMB
-  fi
-  gl_STDLIB_MODULE_INDICATOR([wctomb])
   gl_WCTYPE_H
-  gl_FUNC_WMEMCPY
-  if test $HAVE_WMEMCPY = 0; then
-    AC_LIBOBJ([wmemcpy])
+  gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=false
+  gl_gnulib_enabled_configmake=false
+  gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false
+  gl_gnulib_enabled_localcharset=false
+  gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false
+  gl_gnulib_enabled_mbsinit=false
+  gl_gnulib_enabled_mbtowc=false
+  gl_gnulib_enabled_memchr=false
+  gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=false
+  gl_gnulib_enabled_stdlib=false
+  gl_gnulib_enabled_streq=false
+  gl_gnulib_enabled_strnlen1=false
+  gl_gnulib_enabled_verify=false
+  gl_gnulib_enabled_wctomb=false
+  gl_gnulib_enabled_wmemcpy=false
+  func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 ()
+  {
+    if ! $gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547; then
+      gl___BUILTIN_EXPECT
+      gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=true
+    fi
+  }
+  func_gl_gnulib_m4code_configmake ()
+  {
+    if ! $gl_gnulib_enabled_configmake; then
+      gl_CONFIGMAKE_PREP
+      gl_gnulib_enabled_configmake=true
+    fi
+  }
+  func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 ()
+  {
+    if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+      gl_HARD_LOCALE
+      gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true
+    fi
+  }
+  func_gl_gnulib_m4code_localcharset ()
+  {
+    if ! $gl_gnulib_enabled_localcharset; then
+      gl_LOCALCHARSET
+      LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
+      AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+      gl_gnulib_enabled_localcharset=true
+      func_gl_gnulib_m4code_configmake
+    fi
+  }
+  func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 ()
+  {
+    if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then
+      AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS])
+      AC_LIBOBJ([localtime-buffer])
+      gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=true
+    fi
+  }
+  func_gl_gnulib_m4code_mbsinit ()
+  {
+    if ! $gl_gnulib_enabled_mbsinit; then
+      gl_FUNC_MBSINIT
+      if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+        AC_LIBOBJ([mbsinit])
+        gl_PREREQ_MBSINIT
+      fi
+      gl_WCHAR_MODULE_INDICATOR([mbsinit])
+      gl_gnulib_enabled_mbsinit=true
+      if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+        func_gl_gnulib_m4code_verify
+      fi
+    fi
+  }
+  func_gl_gnulib_m4code_mbtowc ()
+  {
+    if ! $gl_gnulib_enabled_mbtowc; then
+      gl_FUNC_MBTOWC
+      if test $REPLACE_MBTOWC = 1; then
+        AC_LIBOBJ([mbtowc])
+        gl_PREREQ_MBTOWC
+      fi
+      gl_STDLIB_MODULE_INDICATOR([mbtowc])
+      gl_gnulib_enabled_mbtowc=true
+      func_gl_gnulib_m4code_stdlib
+    fi
+  }
+  func_gl_gnulib_m4code_memchr ()
+  {
+    if ! $gl_gnulib_enabled_memchr; then
+      gl_FUNC_MEMCHR
+      if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+        AC_LIBOBJ([memchr])
+        gl_PREREQ_MEMCHR
+      fi
+      gl_STRING_MODULE_INDICATOR([memchr])
+      gl_gnulib_enabled_memchr=true
+    fi
+  }
+  func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 ()
+  {
+    if ! $gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147; then
+      gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=true
+    fi
+  }
+  func_gl_gnulib_m4code_stdlib ()
+  {
+    if ! $gl_gnulib_enabled_stdlib; then
+      gl_STDLIB_H
+      gl_gnulib_enabled_stdlib=true
+      func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147
+    fi
+  }
+  func_gl_gnulib_m4code_streq ()
+  {
+    if ! $gl_gnulib_enabled_streq; then
+      gl_gnulib_enabled_streq=true
+    fi
+  }
+  func_gl_gnulib_m4code_strnlen1 ()
+  {
+    if ! $gl_gnulib_enabled_strnlen1; then
+      gl_gnulib_enabled_strnlen1=true
+      func_gl_gnulib_m4code_memchr
+    fi
+  }
+  func_gl_gnulib_m4code_verify ()
+  {
+    if ! $gl_gnulib_enabled_verify; then
+      gl_gnulib_enabled_verify=true
+    fi
+  }
+  func_gl_gnulib_m4code_wctomb ()
+  {
+    if ! $gl_gnulib_enabled_wctomb; then
+      gl_FUNC_WCTOMB
+      if test $REPLACE_WCTOMB = 1; then
+        AC_LIBOBJ([wctomb])
+        gl_PREREQ_WCTOMB
+      fi
+      gl_STDLIB_MODULE_INDICATOR([wctomb])
+      gl_gnulib_enabled_wctomb=true
+      func_gl_gnulib_m4code_stdlib
+    fi
+  }
+  func_gl_gnulib_m4code_wmemcpy ()
+  {
+    if ! $gl_gnulib_enabled_wmemcpy; then
+      gl_FUNC_WMEMCPY
+      if test $HAVE_WMEMCPY = 0; then
+        AC_LIBOBJ([wmemcpy])
+      fi
+      gl_WCHAR_MODULE_INDICATOR([wmemcpy])
+      gl_gnulib_enabled_wmemcpy=true
+    fi
+  }
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    func_gl_gnulib_m4code_mbtowc
   fi
-  gl_WCHAR_MODULE_INDICATOR([wmemcpy])
+  if test $NEED_LOCALTIME_BUFFER = 1; then
+    func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_localcharset
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_mbsinit
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_streq
+  fi
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    func_gl_gnulib_m4code_verify
+  fi
+  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
+    func_gl_gnulib_m4code_strnlen1
+  fi
+  if test $REPLACE_STRSTR = 1; then
+    func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547
+  fi
+  if test $REPLACE_STRSTR = 1; then
+    func_gl_gnulib_m4code_memchr
+  fi
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    func_gl_gnulib_m4code_mbsinit
+  fi
+  if test $HAVE_WCSDUP = 0; then
+    func_gl_gnulib_m4code_wmemcpy
+  fi
+  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
+    func_gl_gnulib_m4code_wctomb
+  fi
+  m4_pattern_allow([^gl_GNULIB_ENABLED_])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547], [$gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_configmake], [$gl_gnulib_enabled_configmake])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_localcharset], [$gl_gnulib_enabled_localcharset])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9], [$gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_mbsinit], [$gl_gnulib_enabled_mbsinit])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_memchr], [$gl_gnulib_enabled_memchr])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147], [$gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_stdlib], [$gl_gnulib_enabled_stdlib])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_streq], [$gl_gnulib_enabled_streq])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_strnlen1], [$gl_gnulib_enabled_strnlen1])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_verify], [$gl_gnulib_enabled_verify])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_wctomb], [$gl_gnulib_enabled_wctomb])
+  AM_CONDITIONAL([gl_GNULIB_ENABLED_wmemcpy], [$gl_gnulib_enabled_wmemcpy])
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -326,6 +491,7 @@ changequote([, ])dnl
   AC_SUBST([gltests_WITNESS])
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  m4_pattern_allow([^gl_GNULIB_ENABLED_])
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(gltests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
@@ -522,9 +688,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/extern-inline.m4
   m4/fcntl-o.m4
   m4/getopt.m4
-  m4/gettext.m4
   m4/gettimeofday.m4
-  m4/glibc2.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
   m4/hard-locale.m4
@@ -533,14 +697,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/iconv_open.m4
   m4/include_next.m4
   m4/inline.m4
-  m4/intdiv0.m4
-  m4/intl.m4
-  m4/intldir.m4
-  m4/intlmacosx.m4
-  m4/intmax.m4
-  m4/inttypes-pri.m4
-  m4/inttypes_h.m4
-  m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
@@ -552,7 +708,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/locale-zh.m4
   m4/locale_h.m4
   m4/localtime-buffer.m4
-  m4/lock.m4
   m4/longlong.m4
   m4/mbrtowc.m4
   m4/mbsinit.m4
@@ -562,18 +717,12 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/memchr.m4
   m4/mmap-anon.m4
   m4/multiarch.m4
-  m4/nls.m4
   m4/nocrash.m4
   m4/off_t.m4
-  m4/po.m4
-  m4/printf-posix.m4
-  m4/progtest.m4
-  m4/size_max.m4
   m4/ssize_t.m4
   m4/stdbool.m4
   m4/stddef_h.m4
   m4/stdint.m4
-  m4/stdint_h.m4
   m4/stdio_h.m4
   m4/stdlib_h.m4
   m4/string_h.m4
@@ -582,11 +731,8 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/sys_stat_h.m4
   m4/sys_time_h.m4
   m4/sys_types_h.m4
-  m4/threadlib.m4
   m4/time_h.m4
-  m4/uintmax_t.m4
   m4/unistd_h.m4
-  m4/visibility.m4
   m4/warn-on-use.m4
   m4/wchar_h.m4
   m4/wchar_t.m4
@@ -597,5 +743,4 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/wctype_h.m4
   m4/wint_t.m4
   m4/wmemcpy.m4
-  m4/xsize.m4
 ])
diff --git a/m4/gnulib-tool.m4 b/m4/gnulib-tool.m4
deleted file mode 100644
index 2e2d8f6..0000000
--- a/m4/gnulib-tool.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-# gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl The following macros need not be invoked explicitly.
-dnl Invoking them does nothing except to declare default arguments
-dnl for "gnulib-tool --import".
-
-dnl Usage: gl_LOCAL_DIR([DIR])
-AC_DEFUN([gl_LOCAL_DIR], [])
-
-dnl Usage: gl_MODULES([module1 module2 ...])
-AC_DEFUN([gl_MODULES], [])
-
-dnl Usage: gl_AVOID([module1 module2 ...])
-AC_DEFUN([gl_AVOID], [])
-
-dnl Usage: gl_SOURCE_BASE([DIR])
-AC_DEFUN([gl_SOURCE_BASE], [])
-
-dnl Usage: gl_M4_BASE([DIR])
-AC_DEFUN([gl_M4_BASE], [])
-
-dnl Usage: gl_PO_BASE([DIR])
-AC_DEFUN([gl_PO_BASE], [])
-
-dnl Usage: gl_DOC_BASE([DIR])
-AC_DEFUN([gl_DOC_BASE], [])
-
-dnl Usage: gl_TESTS_BASE([DIR])
-AC_DEFUN([gl_TESTS_BASE], [])
-
-dnl Usage: gl_WITH_TESTS
-AC_DEFUN([gl_WITH_TESTS], [])
-
-dnl Usage: gl_LIB([LIBNAME])
-AC_DEFUN([gl_LIB], [])
-
-dnl Usage: gl_LGPL or gl_LGPL([VERSION])
-AC_DEFUN([gl_LGPL], [])
-
-dnl Usage: gl_MAKEFILE_NAME([FILENAME])
-AC_DEFUN([gl_MAKEFILE_NAME], [])
-
-dnl Usage: gl_LIBTOOL
-AC_DEFUN([gl_LIBTOOL], [])
-
-dnl Usage: gl_MACRO_PREFIX([PREFIX])
-AC_DEFUN([gl_MACRO_PREFIX], [])
-
-dnl Usage: gl_PO_DOMAIN([DOMAIN])
-AC_DEFUN([gl_PO_DOMAIN], [])
-
-dnl Usage: gl_VC_FILES([BOOLEAN])
-AC_DEFUN([gl_VC_FILES], [])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 81ac1a6..b33ecd0 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2017 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
deleted file mode 100644
index bbbc114..0000000
--- a/m4/intdiv0.m4
+++ /dev/null
@@ -1,87 +0,0 @@
-# intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      gt_cv_int_divbyzero_sigfpe=
-changequote(,)dnl
-      case "$host_os" in
-        macos* | darwin[6-9]* | darwin[1-9][0-9]*)
-          # On Mac OS X 10.2 or newer, just assume the same as when cross-
-          # compiling. If we were to perform the real test, 1 Crash Report
-          # dialog window would pop up.
-          case "$host_cpu" in
-            i[34567]86 | x86_64)
-              gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
-          esac
-          ;;
-      esac
-changequote([,])dnl
-      if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-sigfpe_handler (int sig)
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  _exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (2);
-}
-]])],
-          [gt_cv_int_divbyzero_sigfpe=yes],
-          [gt_cv_int_divbyzero_sigfpe=no],
-          [
-            # Guess based on the CPU.
-changequote(,)dnl
-            case "$host_cpu" in
-              alpha* | i[34567]86 | x86_64 | m68k | s390*)
-                gt_cv_int_divbyzero_sigfpe="guessing yes";;
-              *)
-                gt_cv_int_divbyzero_sigfpe="guessing no";;
-            esac
-changequote([,])dnl
-          ])
-      fi
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
-    [Define if integer division by zero raises signal SIGFPE.])
-])
diff --git a/m4/intl.m4 b/m4/intl.m4
deleted file mode 100644
index 42fac95..0000000
--- a/m4/intl.m4
+++ /dev/null
@@ -1,304 +0,0 @@
-# intl.m4 serial 29 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([gt_GLIBC2])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([gl_VISIBILITY])dnl
-  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([gl_GLIBC21])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-  AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
-  AC_REQUIRE([gt_INTL_MACOSX])dnl
-  AC_REQUIRE([gl_EXTERN_INLINE])dnl
-  AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
-
-  dnl Support for automake's --enable-silent-rules.
-  case "$enable_silent_rules" in
-    yes) INTL_DEFAULT_VERBOSITY=0;;
-    no)  INTL_DEFAULT_VERBOSITY=1;;
-    *)   INTL_DEFAULT_VERBOSITY=1;;
-  esac
-  AC_SUBST([INTL_DEFAULT_VERBOSITY])
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
-  AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
-    snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_newlocale" = yes; then
-    HAVE_NEWLOCALE=1
-  else
-    HAVE_NEWLOCALE=0
-  fi
-  AC_SUBST([HAVE_NEWLOCALE])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_LANGINFO_CODESET
-  gt_LC_MESSAGES
-
-  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-  dnl 1. when we install a shared library, we must arrange to export
-  dnl    auxiliary pointer variables for every exported variable,
-  dnl 2. when we install a shared library and a static library simultaneously,
-  dnl    the include file specifies __declspec(dllimport) and therefore we
-  dnl    must arrange to define the auxiliary pointer variables for the
-  dnl    exported variables _also_ in the static library.
-  if test "$enable_shared" = yes; then
-    case "$host_os" in
-      mingw* | cygwin*) is_woe32dll=yes ;;
-      *) is_woe32dll=no ;;
-    esac
-  else
-    is_woe32dll=no
-  fi
-  WOE32DLL=$is_woe32dll
-  AC_SUBST([WOE32DLL])
-
-  dnl On mingw and Cygwin, we can activate special Makefile rules which add
-  dnl version information to the shared libraries and executables.
-  case "$host_os" in
-    mingw* | cygwin*) is_woe32=yes ;;
-    *) is_woe32=no ;;
-  esac
-  WOE32=$is_woe32
-  AC_SUBST([WOE32])
-  if test $WOE32 = yes; then
-    dnl Check for a program that compiles Windows resource files.
-    AC_CHECK_TOOL([WINDRES], [windres])
-  fi
-
-  dnl Determine whether when creating a library, "-lc" should be passed to
-  dnl libtool or not. On many platforms, it is required for the libtool option
-  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
-  dnl in the *.la files - makes it impossible to create multithreaded programs,
-  dnl because libtool also reorders the -lc to come before the -pthread, and
-  dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
-  case "$host_os" in
-    hpux*) LTLIBC="" ;;
-    *)     LTLIBC="-lc" ;;
-  esac
-  AC_SUBST([LTLIBC])
-
-  dnl Rename some macros and functions used for locking.
-  AH_BOTTOM([
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded
-])
-])
-
-
-dnl Checks for the core files of the intl subdirectory:
-dnl   dcigettext.c
-dnl   eval-plural.h
-dnl   explodename.c
-dnl   finddomain.c
-dnl   gettextP.h
-dnl   gmo.h
-dnl   hash-string.h hash-string.c
-dnl   l10nflist.c
-dnl   libgnuintl.h.in (except the *printf stuff)
-dnl   loadinfo.h
-dnl   loadmsgcat.c
-dnl   localealias.c
-dnl   log.c
-dnl   plural-exp.h plural-exp.c
-dnl   plural.y
-dnl Used by libglocale.
-AC_DEFUN([gt_INTL_SUBDIR_CORE],
-[
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_LOCK])dnl
-
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM(
-       [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]],
-       [[]])],
-    [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
-       [Define to 1 if the compiler understands __builtin_expect.])])
-
-  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
-    argz_stringify argz_next __fsetlocking])
-
-  dnl Solaris 12 provides getlocalename_l, while Illumos doesn't have
-  dnl it nor the equivalent.
-  if test $ac_cv_func_uselocale = yes; then
-    AC_CHECK_FUNCS([getlocalename_l])
-  fi
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
-
-  AM_ICONV
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-2.7 for %define api.pure.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      2.[7-9]* | [3-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
-dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
-AC_DEFUN([gt_GL_ATTRIBUTE], [
-  m4_ifndef([gl_[]COMMON],
-    AH_VERBATIM([gt_gl_attribute],
-[/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#ifndef _GL_UNUSED
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED
-# endif
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#ifndef _GL_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _GL_ATTRIBUTE_PURE /* empty */
-# endif
-#endif
-]))])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
deleted file mode 100644
index 8d74bda..0000000
--- a/m4/intldir.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-# intldir.m4 serial 3 (gettext-0.19.9)
-dnl Copyright (C) 2006, 2009-2014, 2016-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-AC_PREREQ([2.60])
-
-dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
-AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
deleted file mode 100644
index aca924c..0000000
--- a/m4/intlmacosx.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in Mac OS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in Mac OS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyCurrent();]])],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
deleted file mode 100644
index b432fae..0000000
--- a/m4/intmax.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-# intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-          ]],
-          [[intmax_t x = -1;
-            return !x;]])],
-       [gt_cv_c_intmax_t=yes],
-       [gt_cv_c_intmax_t=no])])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE([HAVE_INTMAX_T], [1],
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
deleted file mode 100644
index 2055787..0000000
--- a/m4/inttypes-pri.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-# inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.53])
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_CHECK_HEADERS([inttypes.h])
-  if test $ac_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      [gt_cv_inttypes_pri_broken],
-      [
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-             ]],
-             [[]])],
-          [gt_cv_inttypes_pri_broken=no],
-          [gt_cv_inttypes_pri_broken=yes])
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-    PRI_MACROS_BROKEN=1
-  else
-    PRI_MACROS_BROKEN=0
-  fi
-  AC_SUBST([PRI_MACROS_BROKEN])
-])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
deleted file mode 100644
index 9240305..0000000
--- a/m4/inttypes_h.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-# inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <sys/types.h>
-#include <inttypes.h>
-          ]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_inttypes_h=yes],
-       [gl_cv_header_inttypes_h=no])])
-  if test $gl_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
deleted file mode 100644
index 1c24d6d..0000000
--- a/m4/lcmessage.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-# lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016 Free Software
-dnl Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([gt_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>]],
-          [[return LC_MESSAGES]])],
-       [gt_cv_val_LC_MESSAGES=yes],
-       [gt_cv_val_LC_MESSAGES=no])])
-  if test $gt_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE([HAVE_LC_MESSAGES], [1],
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
diff --git a/m4/lock.m4 b/m4/lock.m4
deleted file mode 100644
index cb04a67..0000000
--- a/m4/lock.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-# lock.m4 serial 14
-dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_LOCK],
-[
-  AC_REQUIRE([gl_THREADLIB])
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    has_rwlock=false
-    AC_CHECK_TYPE([pthread_rwlock_t],
-      [has_rwlock=true
-       AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
-         [Define if the POSIX multithreading library has read/write locks.])],
-      [],
-      [#include <pthread.h>])
-    if $has_rwlock; then
-      gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
-    fi
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM(
-        [[#include <pthread.h>]],
-        [[
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
-        ]])],
-      [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
-         [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
-  fi
-  gl_PREREQ_LOCK
-])
-
-# Prerequisites of lib/glthread/lock.c.
-AC_DEFUN([gl_PREREQ_LOCK], [:])
diff --git a/m4/nls.m4 b/m4/nls.m4
deleted file mode 100644
index afdb9ca..0000000
--- a/m4/nls.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
-dnl Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
diff --git a/m4/po.m4 b/m4/po.m4
deleted file mode 100644
index c5a2f6b..0000000
--- a/m4/po.m4
+++ /dev/null
@@ -1,453 +0,0 @@
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
-  # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assignment from automake < 1.5.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
deleted file mode 100644
index 0577933..0000000
--- a/m4/printf-posix.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-# printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-    gt_cv_func_printf_posix,
-    [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}]])],
-        [gt_cv_func_printf_posix=yes],
-        [gt_cv_func_printf_posix=no],
-        [
-          AC_EGREP_CPP([notposix], [
-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-            ],
-            [gt_cv_func_printf_posix="guessing no"],
-            [gt_cv_func_printf_posix="guessing yes"])
-        ])
-    ])
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE([HAVE_POSIX_PRINTF], [1],
-        [Define if your printf() function supports format strings with positions.])
-      ;;
-  esac
-])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
deleted file mode 100644
index 303bc31..0000000
--- a/m4/progtest.m4
+++ /dev/null
@@ -1,91 +0,0 @@
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$][$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
diff --git a/m4/size_max.m4 b/m4/size_max.m4
deleted file mode 100644
index 05ad1b6..0000000
--- a/m4/size_max.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
-  AC_CHECK_HEADERS([stdint.h])
-  dnl First test whether the system already has SIZE_MAX.
-  AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [
-    gl_cv_size_max=
-    AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], [gl_cv_size_max=yes])
-    if test -z "$gl_cv_size_max"; then
-      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-      dnl than the type 'unsigned long'. Try hard to find a definition that can
-      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-      AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
-        [#include <stddef.h>
-#include <limits.h>], [size_t_bits_minus_1=])
-      AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
-        [#include <stddef.h>], [fits_in_uint=])
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-          AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
-               ]],
-               [[]])],
-            [fits_in_uint=0])
-        fi
-        dnl We cannot use 'expr' to simplify this expression, because 'expr'
-        dnl works only with 'long' integers in the host environment, while we
-        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
-        if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
-      else
-        dnl Shouldn't happen, but who knows...
-        gl_cv_size_max='((size_t)~(size_t)0)'
-      fi
-    fi
-  ])
-  if test "$gl_cv_size_max" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
-      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-  fi
-  dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
-  dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
-  dnl #define by AC_DEFINE_UNQUOTED.
-  AH_VERBATIM([SIZE_MAX],
-[/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#ifndef SIZE_MAX
-# undef SIZE_MAX
-#endif])
-])
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef([AC_COMPUTE_INT], [], [
-  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
deleted file mode 100644
index 786eaa3..0000000
--- a/m4/stdint_h.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-# stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>
-            #include <stdint.h>]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_stdint_h=yes],
-       [gl_cv_header_stdint_h=no])])
-  if test $gl_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
deleted file mode 100644
index f79fde2..0000000
--- a/m4/threadlib.m4
+++ /dev/null
@@ -1,391 +0,0 @@
-# threadlib.m4 serial 12
-dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl gl_THREADLIB
-dnl ------------
-dnl Tests for a multithreading library to be used.
-dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
-dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
-dnl default is 'no', otherwise it is system dependent. In both cases, the user
-dnl can change the choice through the options --enable-threads=choice or
-dnl --disable-threads.
-dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
-dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
-dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
-dnl libtool).
-dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
-dnl programs that really need multithread functionality. The difference
-dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
-dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
-dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
-dnl multithread-safe programs.
-
-AC_DEFUN([gl_THREADLIB_EARLY],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
-])
-
-dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
-
-AC_DEFUN([gl_THREADLIB_EARLY_BODY],
-[
-  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
-  dnl influences the result of the autoconf tests that test for *_unlocked
-  dnl declarations, on AIX 5 at least. Therefore it must come early.
-  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
-  AC_BEFORE([$0], [gl_ARGP])dnl
-
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
-  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-  dnl AC_GNU_SOURCE.
-  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
-    [AC_REQUIRE([AC_GNU_SOURCE])])
-  dnl Check for multithreading.
-  m4_ifdef([gl_THREADLIB_DEFAULT_NO],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
-  AC_ARG_ENABLE([threads],
-AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
-AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
-    [gl_use_threads=$enableval],
-    [if test -n "$gl_use_threads_default"; then
-       gl_use_threads="$gl_use_threads_default"
-     else
-changequote(,)dnl
-       case "$host_os" in
-         dnl Disable multithreading by default on OSF/1, because it interferes
-         dnl with fork()/exec(): When msgexec is linked with -lpthread, its
-         dnl child process gets an endless segmentation fault inside execvp().
-         dnl Disable multithreading by default on Cygwin 1.5.x, because it has
-         dnl bugs that lead to endless loops or crashes. See
-         dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
-         osf*) gl_use_threads=no ;;
-         cygwin*)
-               case `uname -r` in
-                 1.[0-5].*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-changequote([,])dnl
-     fi
-    ])
-  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-    # For using <pthread.h>:
-    case "$host_os" in
-      osf*)
-        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
-        # groks <pthread.h>. cc also understands the flag -pthread, but
-        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
-        # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
-        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
-        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-        ;;
-    esac
-    # Some systems optimize for single-threaded programs by default, and
-    # need special flags to disable these optimizations. For example, the
-    # definition of 'errno' in <errno.h>.
-    case "$host_os" in
-      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-    esac
-  fi
-])
-
-dnl The guts of gl_THREADLIB. Needs to be expanded only once.
-
-AC_DEFUN([gl_THREADLIB_BODY],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
-  gl_threads_api=none
-  LIBTHREAD=
-  LTLIBTHREAD=
-  LIBMULTITHREAD=
-  LTLIBMULTITHREAD=
-  if test "$gl_use_threads" != no; then
-    dnl Check whether the compiler and linker support weak declarations.
-    AC_CACHE_CHECK([whether imported symbols can be declared weak],
-      [gl_cv_have_weak],
-      [gl_cv_have_weak=no
-       dnl First, test whether the compiler accepts it syntactically.
-       AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[extern void xyzzy ();
-#pragma weak xyzzy]],
-            [[xyzzy();]])],
-         [gl_cv_have_weak=maybe])
-       if test $gl_cv_have_weak = maybe; then
-         dnl Second, test whether it actually works. On Cygwin 1.7.2, with
-         dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
-         AC_RUN_IFELSE(
-           [AC_LANG_SOURCE([[
-#include <stdio.h>
-#pragma weak fputs
-int main ()
-{
-  return (fputs == NULL);
-}]])],
-           [gl_cv_have_weak=yes],
-           [gl_cv_have_weak=no],
-           [dnl When cross-compiling, assume that only ELF platforms support
-            dnl weak symbols.
-            AC_EGREP_CPP([Extensible Linking Format],
-              [#ifdef __ELF__
-               Extensible Linking Format
-               #endif
-              ],
-              [gl_cv_have_weak="guessing yes"],
-              [gl_cv_have_weak="guessing no"])
-           ])
-       fi
-      ])
-    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
-      AC_CHECK_HEADER([pthread.h],
-        [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
-      if test "$gl_have_pthread_h" = yes; then
-        # Other possible tests:
-        #   -lpthreads (FSU threads, PCthreads)
-        #   -lgthreads
-        gl_have_pthread=
-        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
-        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
-        # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-               ]],
-               [[pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);]])],
-            [gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
-
-        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
-        # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
-          # The program links fine without libpthread. But it may actually
-          # need to link with libpthread in order to create multiple threads.
-          AC_CHECK_LIB([pthread], [pthread_kill],
-            [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-             # On Solaris and HP-UX, most pthread functions exist also in libc.
-             # Therefore pthread_in_use() needs to actually try to create a
-             # thread: pthread_create from libc will fail, whereas
-             # pthread_create will actually create a thread.
-             # On Solaris 10 or newer, this test is no longer needed, because
-             # libc contains the fully functional pthread functions.
-             case "$host_os" in
-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
-                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
-                   [Define if the pthread_in_use() detection is hard.])
-             esac
-            ])
-        elif test -z "$gl_have_pthread"; then
-          # Some library is needed. Try libpthread and libc_r.
-          AC_CHECK_LIB([pthread], [pthread_kill],
-            [gl_have_pthread=yes
-             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
-          if test -z "$gl_have_pthread"; then
-            # For FreeBSD 4.
-            AC_CHECK_LIB([c_r], [pthread_kill],
-              [gl_have_pthread=yes
-               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
-               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
-          fi
-        fi
-        if test -n "$gl_have_pthread"; then
-          gl_threads_api=posix
-          AC_DEFINE([USE_POSIX_THREADS], [1],
-            [Define if the POSIX multithreading library can be used.])
-          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-              AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
-                [Define if references to the POSIX multithreading library should be made weak.])
-              LIBTHREAD=
-              LTLIBTHREAD=
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
-        gl_have_solaristhread=
-        gl_save_LIBS="$LIBS"
-        LIBS="$LIBS -lthread"
-        AC_LINK_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <thread.h>
-#include <synch.h>
-             ]],
-             [[thr_self();]])],
-          [gl_have_solaristhread=yes])
-        LIBS="$gl_save_LIBS"
-        if test -n "$gl_have_solaristhread"; then
-          gl_threads_api=solaris
-          LIBTHREAD=-lthread
-          LTLIBTHREAD=-lthread
-          LIBMULTITHREAD="$LIBTHREAD"
-          LTLIBMULTITHREAD="$LTLIBTHREAD"
-          AC_DEFINE([USE_SOLARIS_THREADS], [1],
-            [Define if the old Solaris multithreading library can be used.])
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
-              [Define if references to the old Solaris multithreading library should be made weak.])
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      fi
-    fi
-    if test "$gl_use_threads" = pth; then
-      gl_save_CPPFLAGS="$CPPFLAGS"
-      AC_LIB_LINKFLAGS([pth])
-      gl_have_pth=
-      gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
-        [gl_have_pth=yes])
-      LIBS="$gl_save_LIBS"
-      if test -n "$gl_have_pth"; then
-        gl_threads_api=pth
-        LIBTHREAD="$LIBPTH"
-        LTLIBTHREAD="$LTLIBPTH"
-        LIBMULTITHREAD="$LIBTHREAD"
-        LTLIBMULTITHREAD="$LTLIBTHREAD"
-        AC_DEFINE([USE_PTH_THREADS], [1],
-          [Define if the GNU Pth multithreading library can be used.])
-        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
-              [Define if references to the GNU Pth multithreading library should be made weak.])
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      else
-        CPPFLAGS="$gl_save_CPPFLAGS"
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
-            AC_DEFINE([USE_WINDOWS_THREADS], [1],
-              [Define if the native Windows multithreading API can be used.])
-          fi
-          ;;
-      esac
-    fi
-  fi
-  AC_MSG_CHECKING([for multithread API to use])
-  AC_MSG_RESULT([$gl_threads_api])
-  AC_SUBST([LIBTHREAD])
-  AC_SUBST([LTLIBTHREAD])
-  AC_SUBST([LIBMULTITHREAD])
-  AC_SUBST([LTLIBMULTITHREAD])
-])
-
-AC_DEFUN([gl_THREADLIB],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY])
-  AC_REQUIRE([gl_THREADLIB_BODY])
-])
-
-
-dnl gl_DISABLE_THREADS
-dnl ------------------
-dnl Sets the gl_THREADLIB default so that threads are not used by default.
-dnl The user can still override it at installation time, by using the
-dnl configure option '--enable-threads'.
-
-AC_DEFUN([gl_DISABLE_THREADS], [
-  m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
-])
-
-
-dnl Survey of platforms:
-dnl
-dnl Platform           Available  Compiler    Supports   test-lock
-dnl                    flavours   option      weak       result
-dnl ---------------    ---------  ---------   --------   ---------
-dnl Linux 2.4/glibc    posix      -lpthread       Y      OK
-dnl
-dnl GNU Hurd/glibc     posix
-dnl
-dnl Ubuntu 14.04       posix      -pthread        Y      OK
-dnl
-dnl FreeBSD 5.3        posix      -lc_r           Y
-dnl                    posix      -lkse ?         Y
-dnl                    posix      -lpthread ?     Y
-dnl                    posix      -lthr           Y
-dnl
-dnl FreeBSD 5.2        posix      -lc_r           Y
-dnl                    posix      -lkse           Y
-dnl                    posix      -lthr           Y
-dnl
-dnl FreeBSD 4.0,4.10   posix      -lc_r           Y      OK
-dnl
-dnl NetBSD 1.6         --
-dnl
-dnl OpenBSD 3.4        posix      -lpthread       Y      OK
-dnl
-dnl Mac OS X 10.[123]  posix      -lpthread       Y      OK
-dnl
-dnl Solaris 7,8,9      posix      -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
-dnl                    solaris    -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
-dnl
-dnl HP-UX 11           posix      -lpthread       N (cc) OK
-dnl                                               Y (gcc)
-dnl
-dnl IRIX 6.5           posix      -lpthread       Y      0.5
-dnl
-dnl AIX 4.3,5.1        posix      -lpthread       N      AIX 4: 0.5; AIX 5: OK
-dnl
-dnl OSF/1 4.0,5.1      posix      -pthread (cc)   N      OK
-dnl                               -lpthread (gcc) Y
-dnl
-dnl Cygwin             posix      -lpthread       Y      OK
-dnl
-dnl Any of the above   pth        -lpth                  0.0
-dnl
-dnl Mingw              windows                    N      OK
-dnl
-dnl BeOS 5             --
-dnl
-dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
-dnl turned off:
-dnl   OK if all three tests terminate OK,
-dnl   0.5 if the first test terminates OK but the second one loops endlessly,
-dnl   0.0 if the first test already loops endlessly.
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
deleted file mode 100644
index 7e3b3df..0000000
--- a/m4/uintmax_t.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-# uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-AC_PREREQ([2.13])
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-    test $ac_cv_type_unsigned_long_long_int = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE([HAVE_UINTMAX_T], [1],
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
deleted file mode 100644
index ce00e72..0000000
--- a/m4/visibility.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([gl_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING([whether the -Werror option is usable])
-    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_vis_werror=yes],
-        [gl_cv_cc_vis_werror=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
-    dnl Now check whether visibility declarations are supported.
-    AC_MSG_CHECKING([for simple visibility declarations])
-    AC_CACHE_VAL([gl_cv_cc_visibility], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      dnl We use the option -Werror and a function dummyfunc, because on some
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-      dnl "visibility attribute not supported in this configuration; ignored"
-      dnl at the first function definition in every compilation unit, and we
-      dnl don't want to use the option in this case.
-      if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-             void dummyfunc (void) {}
-           ]],
-           [[]])],
-        [gl_cv_cc_visibility=yes],
-        [gl_cv_cc_visibility=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
deleted file mode 100644
index 5f85057..0000000
--- a/m4/xsize.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_XSIZE],
-[
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_CHECK_HEADERS([stdint.h])
-])
diff --git a/po/da.gmo b/po/da.gmo
index f61890fa24063529996afdb598fcd012861778db..1d3bf75aedcf9a5d5a4f8877b9d56295c366c47f 100644
GIT binary patch
delta 1739
zcmXxkX>3hF6u|LQyYkxCMN#FwR?D;1>wAg{x+%4*y$H26Rh4L!1c_^jCW;SIB$kSV
zAV}JzBx3m>MI&|+5?fl8SW;_5q9O4=W_<e1nLBsp%$+m$NlVE6mXO->9h`?DA}6v$
zB1EKooJcrUU=KWqQCNdLu^xNjE9{QH?DL2mGcF0c(VvDfI2{wQ5WTn?<MBMY@P3Xs
z{}y;jhc5gT-6-Ql`alF~B7Tg-i5QKGFcwQu6W?P!hH=ETn2GmrH-=9TIfF;gi{o-d
zX5-3SN5n_tG9B%(8HeF})XaNNG%sYKF1Q>uu`SkW>_>bRld%~+7&*!G2T<dD)GxQu
z#s_d9@kPgWG@=fW$!5Vg)CI?23eHDOs1p5HgM+XU2V>VMB116^1Goxxfuq(2)cL++
z8+1)II&RyDvc_0@TH~x9Yl1Zi^=N!}0W(o+;-@uin)#CbP!nH>I({o^jT}Ob%8?ox
zE;{a_7R__)gx_!owqh#!ri)M>vKZ&!N&NR5^~`-Uj5*kmcp18}7}Iexj>RiD8e1`$
z^<_k!NGKhJ=*Cj)kK56QXVHsKZ~*?mo!Dn4)lAWx#QkkWZp}3tSh&E<Q--?Z9jF^P
ziYpoS7(Wt^Tukw@zVuyU&NLN+#D&-u52Ge@8nyZ_p%?Gq3T(lpm{(w~Umfbs8gL#9
zwd0}Avxvb#4t*8&C9W<swR0VvBnEz>;o(74u}B66F&WEIKk*6Fs(*y(_!TqJzuNSd
zp(ef$_4eGvL~O-L=qaIqu^4rpdekrcriAa$O_R_y?3P4kVLb8Ywd?@hrKW0&P|tXW
z^*HJe=^AR$J+pqnSmKUlB1xEly0Ki;ofo0Lw+DOUsWQh*e1i_Xeod(N`44KQiR;Ys
zY}5%0kUXUV^%_-T0`A3uSZn)VSYKP4tZz{hc!%K_;*^_41nODG+c<z>#962><k@(&
zeZC1J>94d_TWhWL)~D7F*59ZLhp#t(PRBzdijEZ2Ym<Xra4Kp7`KUWC!VXx1E?kE?
zej7&PF4ST>hWg$)>t$?Dd>eJ02bhA*$b7NVZG*`q&YFz6Kt^4fYgcMjL)Q4t!-x0-
XUVrMSU{y@EC-i?57+#m29Uc4&JpJWp

delta 1745
zcmXZcX>3hF6u|LQwASkOx~Qe^)uUBjwS6AdP?Roe7fK|m4MkKJMe)Uzh%HUj79U6~
zZ6p;EM4O02EFYwnh@FJQmR3ng>=B9jA2XkRbLP&SbLP&>z1JD^s59vN*%0SRkVs>W
zNQ8)NnI;m3br^?7F$$Y;0Jh>le2cO8*FKNQHRDn+n*MBz!3F5Wa&+T9^xy>y#Yef~
z{7>+P4o&<6!!bBdWC+Hf781ZnoQ*Cl#dxemEquSV5eE^s;1qm_b?C|$X~Gle#_0tV
zhieKPkz^WI>F9wSI0iqVR-QQBypWHYa5ZXS+pP^aocKDXVh1K*Y@z8NhZ+~7ez~nS
zK7uL4mmS;DhB_d4hDqo_O_+n}xD>UZdQ8J+9Eoi>3L|EUjK*xtz)I8vC#`o;=lg}-
zFmjgBiMEY6>p<%etH<iKCRtNZx5kIfn1^~M{#c`Cn=d&MweS+u@jFn@$T4KA9BHNz
zO2-4#L-PuI;ZO8o7Y5KbM}*@c%W)x|#{bVz_uMzvScpA|S7A6-;UwIK*?0{nU>By6
zUna~G=|e|3hGQ)z;Vw+ZbLhtBI0Ap;4jek4)6Ahcjfc96+$k~(C|P3W*@U{{-KYyV
ziDis?h98M17PD>Sm*iz;PqWZZT#o(lIBG#>QBVIBbmM(ofnTr`i%QJ(yM(&3ySRu%
zy?Lnflrq@QrdQ%n;)a#x?A%0W7z4l3NZ>)-8j;DEiK(~+^%FOtp8BUa34h=e43wMx
zO{j$*M!h|^(TiPJh~Bj#i?IrIo>tT^{C+LppPMFO6(UC{WHEY(zg4pWj9zC>Z3XHc
z@3x*o{UO~zJ#;Uv-!Y!JUyaBxOhR4QEYy`(puV>s2jiI<$4q>S4!wTusQ0<sdQ<5L
z)Wij-6P6)$N*(Gos>eh;fGOBw`(In%S=+52Pz&h9Fbr`vm_`ihUJtkNIP6cHkNQH9
zjjQc*eJ_&!dTWEV#oB6pVf}0k+Gz5*FoO3TFO4V~V^Ob7A@;@js09?GuDAk2a2<x?
zX4LUJ(S>_a4_hPZd*`iJF_`!sYM#fKjvdH+@e*HaD)CtTs0nf}jt|`v2=-Oilw};e
hk(1Xu;LGs4)5d3|9gLWo(8olXS!tOUv!=TI{{Uh&=_mjI

diff --git a/po/de.gmo b/po/de.gmo
index cbaf1ef38570010c38a2d16bd359b5e9312560c2..97c1a0b04ea2a342fa31d82e40df3be12000a6ab 100644
GIT binary patch
delta 4004
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

delta 3835
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
Hp)KbBFo)pu

diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 3ae2a99652a3f1b5775f28fec1ae6faf215953d1..d1aaf20a62df28ebe9f112b580983c3b6ef28187 100644
GIT binary patch
delta 1738
zcmYM!Ye?2-7{~GJX(=@4smwIDPMU3I_E=`-nzl4`og7;mm6{kc%c!(yNZa`LLfHm8
zxQyyeL|M^`7L_$)Ll{JBYb+Y0jIzNBNf?gWs24?}@2~#_f$+Jn`*1z?;rhF8DAF|)
zIe9!bXpNY4FEmRrv$5r7qcI0l@eNGE72e;7V~E>4{sQBP4`3pG>-OPT;@|KUyn_=l
zvM7uvqvn?`vcTeKRMR1APzjrG9BxN#>`P3>L#Pd$!I$x8RH8xDMjv20##Wduz)AQq
zHsC@06SZz<r5S&=zcMhJN@I{{B*s;l<zW)$U@2-rGiKnYI2pUW{{m(c-^OV;>aB2o
zKB|8?YW{ZAP3%S8#95q<R|6XQfym-;U;<7dE<v570i*a4X5w+2g;!7sURYw5i!*UH
z)}qEc@ijb;S~ra2F?lI#FxL&D-Y9U3-1+VTx7@A55hPfOdgE%;6E(U!+^<m^I*eI(
z9n<g$>d8`<Jv(?{*)-HqhAO^yQE$BtbFmHc@d(bxe&iV~WqEkg8q}43<(@$0xr_<;
z7tY0dI1gW~HY>ojm`VNFUK%gb@dGB}PpGTAhN=yFn?izY)DKl+2R13DXoj(!JB@!Y
zEY4jk&0b>sD5{8iFb99dKbZFrhlnrLa!`KXdg{!I@B+S$|6?2$uL(C)foa6=yIb7P
zP)~3Wb>d#s2`}MherRNUxRGsZDNf#OCr)7e*azW;E@JSAfq!XCVPLq)>`hEsA71%8
zID@zyweU3Rv-urMF?~Z=T&u8{_!G>-bEsmwi^?~mnL5F8RI%?y<vZ2P{g=_WLPs|{
zPT3eHJhz!ohyDRnqUl@01r?|#XhbFIK#d=A``qiO1O11ZpW4E^V<BpOJ?eAZ(GrA-
z_tBw=y{Lu#KH(ASyH9HkYoP$SFk6l6*Xl468!#U`P~*Ms_ims2BdR9OV<O%Ryz#gD
z*p1s7)<6bo!8DIcQ45z~GS;}8+`#<?M>F2-e&_yzS~uVZ|Imo1!?y9?3ldPpmxh{{
zg*s`WTZ{?BB^Zm#P(`=`wXPYJ??aE<F^0Gkm2VHKrj8-&$J;d;W9Yc$-bW>f>6sV*
g`JAqc3oAwy&WO&M6rEE%yDPP9;`6Adr0hoYDM(1-00000

delta 1744
zcmYMzc}&l77{Ku-6iK&GiIlU;uLwV}=+_~Y+hndZ!jCC2GsnJW`Xl2Hat?oxxov23
zW~|L-u1w<($L82*%^#LI#vi<&eV@(t+g_jNb3EVA@%$Rv0}i(bT)r6OYzz=-%oFJ?
zB60a5Q8*I&U>-)`eCzjPH1Rfz_hKmVDGbM}W(&p;KgR@Y$AK7B;KoBy=jRuQBOx^A
z(4khKCR~GkaWm@1_F*KRLEXSj?2k`S6Lp|&^f$(0NTJ9i9D-Z13Qyoi)OB@5BK+iJ
zk;5b!9YozQVv0xx#$XEOqb{h%c-)PH@T~Pe#G%BWaTtabyYt7O_RmJ0zZvx=j-lSf
zElkB%4h{W4&{TII8Iy>8s3)mH4{pa~yn<Qy0yRO85|K0<jiYcW>i7X1fe%pEbz&U$
zDHZ98nWmF%4X-)ToNN}D#bz0HA;C=4H=cv~M1IpT_oHs;91g~}*blpuxlb049Ndvq
z>zIOCeC4Qby&BVS8)o8poPckTXO!4!?nx_9ue8BzLe0~LVfYEh;&=37`gCp!S70*V
zmt!<~(s2*N@e%6Py+*B#z!@Tmn2P$LQmn%@8dEf#xRX1Ln(G$lp>mO4j9)-4;v1NP
z&#;Yof3Tgnbs-1k`*LHE$T)n6IoNfv`)|la-B1bk!v*FBa}VkhoJKuyGwKOjaV;MT
zUgB<KQzga8o7Ld}#xE^%H}n{t-wgbuk;Fjf3X#bev(mltd6-UIkGk+W>fh!i=Hh@=
zZgDNf@x(hY1Mi>~+ZWV)-Tfk5rWB(V`w`T9*ZkbSkH!l+8rgB|YB%AXwIV#1yhlys
zsdg8Xpgw^gHPJ5A@iS(N`4;s+zfkAL*N6<q9Mt*CQ2&ljjpHUhPKQoxMqT*ECj3SH
z-zThdYr%_Lm@Gl|E0vgxRhWspP{*6iyJm}dAGIbPU^u>Wtnt;9T6Z7<Lzs|=x**Ns
zd>fyEk@Q!XwdPLqAVx8M*1T;#MP2vabiUCDr6X`X1%uJ3A5K7>I0E&gIc6?~5&JL*
zXQ3A1eAIQ-sQI>7T#tdo2T=1JMXjkz$oe>WO(U9)59SZl1U;L)q4n8;={2>>vl?3R
a3WKxLvqmL)yyHC$k-mZdqb9HKmFFKG+2p?f

diff --git a/po/en@quot.po b/po/en@quot.po
index 47fd5c9..f31f3d0 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 09:01+1000\n"
-"PO-Revision-Date: 2017-05-23 09:01+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\n"
+"PO-Revision-Date: 2017-06-02 05:31+1000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -43,18 +43,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr "Star Traders"
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr "Play Star Traders, a simple game of interstellar trading"
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr "game;interstellar;trading;strategy;"
 
@@ -62,7 +62,7 @@ msgstr "game;interstellar;trading;strategy;"
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr "trader"
 
@@ -1310,7 +1310,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/po/en_AU.gmo b/po/en_AU.gmo
index 840928371d04d1f33ccb8648bc7535b39a20fee7..eae7c38e85c5b86abc00a028b24e1d1195e0d096 100644
GIT binary patch
delta 1739
zcmXxkYe?2-7{~F;4njUXskLQUO{bY@si~P+ElZbnuyufq+*(1b(-WClBt`Kj!Zx9@
zlD+6fqZ2VkRNzM0i(*g+EgA&1L5;mhkX%vFW;lYrKkh4d;B#O1;ku9i=U!h@PhZm2
zOUcoxB(w81W*?Z@C!d;)#??3$H)0y@_xhtahWL!fKVzJ@2UGE(+lwC(|BI6_w#Y0C
z3sCVARR7J3EV3AdRx0EnRKgC-z|*LO{etOu7qx&VI1yi>62<GnLMP#P;$mEYi*Y};
z<5^6u595ABes-rmGRvb7Uu-rE%dr?|V<B!vO>`0`;1&EBfAjk1IE6T6iCI3DqWU+Y
z>i3}fpGNKc7V0Ga!fE(6qM!i<OG85)<`8c}?W7&c@I2<?Baa7B35u4PO~*zo$HS=p
zH?RPoqsC=4m}TNz9ExAK(U)FW=WcK}xe2$)ZNVWV*n_&`y{Ieda4)#ss0H1}$v9-W
z**MHcUD*O;<B_fOitVV!cK~(Q$8kEI!&3Ym=V8)kW?ZMuNA0u?b)?tbKT&z!;3$l(
zFssB&tishe6OUjn^V_c!QmE*~RD6j#I$IguMj>V^L`}34+wg>99!<t7j-4~D{5(9)
zn`_KQ(*6MTi2uey9KeV4%V{+0Cw{Y*jWWMI{h9}d|KVILSr@*BZKwsc;yC=)J>zzx
zuHXS`$9<?B{*TQ}RIxrR<l+X7ojdEok7$4VO<2$%MuRluZ48etdyCmZI@F?$ybX)+
z8fsuK>a!WP)vOvDFc**D9K4Ff*pGT_nTe3E0y$J`MLqT&RKBMP&cBwz&~0WHSaCfn
z;Xh4gT%V=w2#MCC2JAy!!6{UtZf}3&zH&!4hYjVU`Y*+)m_RM86ZJV>ZjM6Yd)~1h
zb7+X|3>}J5-+cq>e_{)AV0H{yubn_G_<JnHZd7}}`@((YzDB)?0Zhfzs3jD#+!D7M
zV{}-78t|3JyS!cF(y8xo&$?ai9UM*jAMP{vEoxlau3(fyAx_0i9Dy~ci5tAb8q`h`
zZWHRWYQbbYh<b$Ip~n4y%J-AU*Ks)UZPdhfQE%!AGCtE%c8AX<-OWQKsOqYUw^wxb
f)YOfbRWze4dq%~a^3JifSt;+MvdXUN+IZ<Z>$>H>

delta 1745
zcmXZcd1%gY9Ki9<#>UJ%+n94aY#6i6E^Lo`hq+l<2qQ<>u*W8p<rg7$u^IV8xd~CD
z5L1X~g^+R-@&}U)QLcD@`hM!E*YEQ^KHvMf`#z-ceaMBg;ohMTk)wGc9YiFrKqMBY
zV@E8*Xxw1sd$B$7af`2D6mcW^@VVK9am2r{J4P3Z_%RJNo{ZXlS)q6m$wxH>>Q>Z*
zwb%)dpib;6#^3|g3B190{EnI^c8r^70(K$J!cjO0t8q6T#>gVq?;P@z`$e8eA3kEo
zinPQWOvB-rjLT35+K=7vBKE?ER{j<H68px9B;jDx_NA!h>rmStL0$Q6)SY;X12EJZ
z?>eNRR!qPIEJt0*Zp_3}n20Yd{)d_%bAm_;mSPs}Ky7~m`{P&Ce(@7Uy5cBofwN3+
zu6-;p7n|i~g;`~;!B7&cLp|g5s7F+5o;Dj$C-fM5W2;FboiPRV$O@62@}$HHDp4=r
zM%1(3hbedxGw=xx!|=%>9H-=?u5>%<&RsWOq2~FE?J#<Z$Pn~nE>6d6+=GdXFL(H8
zLqQYz@H^_(g-vyLV<7e<E<qh=HEzZ_jkz@O#UfkS(_tm<a^9LD(w6#XsF(O1CgUG`
zO1q?)A|HwW&Ss&EFCXS`@$fee#q3h|8iJ@3s>aT^(>!iApdP_9)D?e1U7^es2{KRs
zbs}fxGbm?v8G8`FUg#$D54~ShBrkH8uFn#Y(KHx~y5-w36|bRoY(jlD5lclzVlgJ-
z9t_|mOv7f>%jPe0`2xtMN;T^1XhhBTp^W{{=c9GG$T4O-5jEkL75qtHT!l-t5VeDc
zemsPlsKM%Am_N*zpj%K1YWpeJ4=Ye7b^!G`)(1V8_>nbi#sn&&SGopSsPDcQ^?zbH
zvSCt#%vb7ACwveyumQEc+5BeyFn^-ni9hJW4qm1E=xt`31sF+#X{a6MS-jTjH(?Cr
zwdM))vUwk4sefsHHbbjizc|xN;v<TNxfp>(r~?;UgE^=xtuU)lpVb-+$1SLra2IO7
zqp11LTYMeEi0`3J_yOvjdV}=uD!x_j*>p6MQ4@@)&yCtPC@eKtxhS*dX5N^HL8+Np
ZJ=1do=`}I={x&Yk38d%L2lAsb{sWCr=zahI

diff --git a/po/en_CA.gmo b/po/en_CA.gmo
index 092e11e4c22bef00c4a2c6350f376410eead9b64..71214a38d86883a3c5376e36280f6575d4c9a059 100644
GIT binary patch
delta 1739
zcmXxjS4fs&6u|Lgi$1^9mSx-eGRsk^nc1{lWoZVL3N1>*2KiY^(cmRoG;H8S7e$-s
z!lIJ2iy}y*K|zoP8Qmm=Rur^oK=nU7CwSraoM)V8zK=UXnma<S*Y)sDhKO98Bhp_)
zre%rr#X=l_Yp^$NxBA1_kNAwmH!+O386)ty*^ZIKUvL=uvPDK<ENYyK+P^GYJn>Vg
zrb69~ny>~3;wjXH)ngxgh`N9_9Eu-N6Zv!8LWkfW;sngV9NdWq@H}?Qb>l80pETuq
zA~6*Fb7{mR9FLPR4$Dv{I*vo|DvrcQR{tKy5cizN?r;KX|02}-D%Ad`P<MV8^(0<l
zJpT45=z!Qf*N}yyh)Yp-asZR@JO;4E;vc99;^(tlEW#Ari`xG-j>Gq;<02P`490Zq
zii=IJ*b2+cRc5JKZf-P#*o6dDsCT>-^@?iD3uYtgf}Y@LlzfpWh(W!wnaIXHDX@wS
zsE=<4>Rlhj1U!dH_!Ot(U*tMvdV$;N9@HakFkhhN`Htb}TPTu-QJ9W}I0+A7fcfPf
zg-|NmF#<oL9^D_*w=uR*BpM4)C#t}GcuZp+P2?hx{hVp)68AXo6pQqt{Tb>bevNVX
z4O{6KUBa~xe_zH%nP1*47ny=zaT+GBaDT%()CE;z6z((6n2o4c@C<dwZ&7#n6N5~Y
zveGT&(rVrpcXk7Z)Bdv5E$9b&zi0@Qxkop=Tx2#KW}_bY9!$hrr~}(kf157rL}p<g
z2JjG0#cMboJ5e87)OwdM1vyNqMt$tfsQKQk=lnA%glrJG#EP>~6TaKTabtLeOSBwy
zz&6w?IEk95(b`+gPiAP)Z72q{|6Cl4<){lgf%-ev1wEJev32akQ8f4}U55nJ|2_}(
zEv!WjOpYMym1C$2uEiv5L~ZXhKbW7)&!}(W8%AK5x7ihjnTh5M^wS|9bwG*5mDaus
z`%qtFo;7cnP1u+AR<pzWjXExTi_?py5Jp8Z`Y;1^;ymlH6m_TN=0?=tDu_MMLw$t%
zQOBJ|&3DD(2JB9JA9dn~sBfwb89!KhR=M9M!VI7$NUKi|JD6JgU`~#2a^l3~=!vOQ
UQ)&lfjtKo9C8yQT%Je7w1J`-x5&!@I

delta 1745
zcmXZcduYvJ7{Kvo*feu?bsb|iV`kINnakNBm(7L^b7@6}$jYY8nOj-(laO0s8~MW@
zG?#?J3Ne2W(F##3mqPw=N`@$GO}<a>Q(K?+c`wiJy`IOBsE$a~^{X-7nJAIgB9TEN
zGJCE_GFIXc+=z+jS^aTLA#Sz!Hu{J=Facki5gbhX2h%XVL}WDPqQ(nR``4C;Cvg-S
zsZbA~CTzl?coubHcQ6T`p-$ifj>Mm+i4sfQMALCNu^(q+Iqt%vcn)Ldxp7yJKY2RO
z6Um~GIA5e6PQ^($9doc2^+P9d1m46k_}uEh<2Yj90+I1J8MS{EYW+^s{%28F{t$I1
zKH@|augnd|MQvDs8CZk5lA{>Fi<pUTEbc{3kYCQWVigwPA=Li&aRPov9hbV0f1HVZ
zai!_4w!%8I+N?3_%m#Bi_94Me)HB|NdPGg;C9@rMLN9SFMlTW>hB>H5R*dYFC(ErO
zjC%R@pq_Oz=HdnP<13tj{T7RGoH7S>r3X=W?w<J$HBS%5V|<0kG)%)nti;K93^Vz@
zJfbjwiU=m)Pt>jJyTsj%JWMBEj{2c(xF1_I=F+4t<>IoZp-Oi-AFL1=NP8#hCH{mt
z*o~d^%UUV&g}A4Rh4Ov*yjmoPe{nhn*0|SDk2;}79EOL@R<j-T2s%+$`~`J||1ivl
zf@|GGF0bcua%Q)16z%UfxC!;5*G)rqwYzkg8`)Mml%j6=LCnLur~@OY&!&Hk$SkbD
zOgx4mY{N;|g?ic2YF)k{vZ>OD`Z_vL^L?&m|BETaY!W%ojLT3HeybPZ_#|bsOSB$!
zz;4tdID?v~-P+%nzs!WNTTl*a|3#RMb*K|Nh58(Cgguw|g>~%03>xAaTn9huyRSg~
zo!EqIn4Cc7D=nxKK8=2CM{Vyif0)0_->7$@8xt_u+u{ltX22}MI65pt9k9mY9oD`V
zlc;Yp&zrZ*r<hFpTl1?aTiv)6)61gZqvJG;#S+vHS6GKts4J~A8&IFsc8tM&sF&~v
z>bP^L`L0=f52J~npicN1>Ye(4j87HcHur1>nc1ibX0#Rh4o!*93va0oG(RjVjh&Jg
aC`ivQ4COZ`6^|a^qF^XL*cK{|^Zy61mgmy|

diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 18b8b4cd5203874beda2703f492ac9f5dcb74902..0a5294e94e75ac50b21114b960fadc581bc96493 100644
GIT binary patch
delta 1739
zcmXxjXGoS&6u|LgOMUIlhGp5X)U4D*-yCIyrKwq(MYL!LX;=zrDMb-I(E`f`1${7D
zSoEO+8`_5=C<KdwpaB(qQHb7*f)<6)_#f^G9{AmJ$GP))6b$JIhO}NC;GGH)X~`3b
z5|NyFB15qZN8oxKj61CU5Dp_gWASzL6L(-FJ~O*<IPq5;i(v&Kv6zS&7ozsBED%p3
zC^S%^?m<o1gwfcHy09BK1Upd|@EXV9C)7l~LbuQu97UXrbFct+;X%BBeT&?<OUNe=
ziae2t6nyhV`e7QTVkRbGCF(@Sa5P@U3HZ?JdoYnWv{+;krlR&=j#^)j+P@if=XX(0
z;teKauSY=#Brb3b`4~rBfx44}7{K!wkIyasiJBm3p-2iY$7#3^wf}9Lf<36?qDn+!
za60zIrKY#S3aia>v%;)0Ys^~gLxOtLJKlzRMNQ@fvmJFok1+xN;z&#=byqeU*|;aA
zR#A=m_;#Y+^$|?LbC`}#a2EbSu2W_%ay#9NdZcaUOVm6+a1e%-iDY9m&cHIvz($N`
zez`}%M@2VA;wRLj`;GcGCM^~jkEN&+ZN>w5RAU}Z)Do_VGtF4$9_O8vA_HlEiu#D(
zViJDGm-LHWCGwH@#~L=u{L;0Sd%<rw6I0f?zhNWlf*Non?l;ev?WkAq6m`e%P<QwX
z>zF7|?iSLro=tFPtvHVMSCwu-Khf)@A#Q_vbYnM)%%#H|)Fa=EQ}Gt+z;4vvCS;RH
zE*4`vHewE5!&D5SKDOv;moI=ErZk{F_72p1UDcd_J_V@}xyXv=p(gyWS%m8of2~Wj
z26e!8)GIiJnyB5{pPQe}@H)4l1l0aTI2o%@7j_)=cf3;Pxx|mGV-VwL2;1U1B%}WK
z#i(y#19D(;7+J3zMP2X-OviTA_MrLE{A_+feG}g?5(j!)U15xwV$Q+{I+UOeSZQ&c
zweP|q)Hj)D%~taP4yFBt`QGeB9p|rida)GzRHS1#=AuqqY#o-N?zGCRLH(_2aRBZ{
zeS`;4$DKyaciG}L>`#0jb>dFcH}x7BA0wd+?zb6a#-S$2x;ew&n0c}@uP{7oYFc1?
WT4v6)lOytDegC6C_RZXUU-~~vYUVru

delta 1745
zcmXZcYfQ~?7{Ku-)QICK*NCV{D$XgX4u(?hxs1*IHccfQWYd`c%-lC5=7krz&&&(7
z7<u6~)`qb$mkskqhA?d|jq!c<d$zNEe$Vgn{I36V_d`VEhlq<8qP$}fBB%02x{1h`
z@glJ}8++hN?1EdZ{s49*K56k4^bt3rAD^2|*q!(%_C;TzNCKvz##2!HmlcX99Vt{%
zq3%FUSdBfg7Ik4)F$N!?F5nHu<9F0V{vx-~1dJmN;8>iDTW}wq!1fc|xbw(Q?oaSU
z22$`(6lsUqI21!T1j|q-I*fhr5)QzJR{s?T5qFv-l7d;N{THCtZ$j-~i@Nh$s3-9j
z)9{~1K?kHwb`29Tk+>9fC;KoH&tMY1u=o#Zf?-oc(s2Q1;cnFaH!u~yqK=E3D$*NA
zV_TeSdJC<v)LdbfniXc)ti(1X*o1n=n^CW*+B|DEpf2b!CS$v4BE2vb^~&;*je9c7
zD%PStJ`eS-4`Di<#vneyQP{RvgzJ>Cs5{+-dZgFQSEzYfu`~Lni{xND=HYA{j{7l*
z`Q;9UXeye}kKa*`uFVYhHqx;_@hsGdHsB7d(U?aQH&bLMXPP(1J<gkRc@MNdMSaBY
za0vd!XY@;+C-RB7bs-yNetEx0Bo}|-NDMA^U&CtD1yx}$++&_J8&I#{De8_tqVDi7
zhM6d5iCf6I<vdRAtRDN({(6O5&>!?#X-Fw?k1nxPWE>p|QIC8VX5cl{fla8NO;j2G
z6<CZ(xF17!8HZvs>SK#9clmOVLzODj$KHsV?|nJvUqB&p75B`FC!r?%vWDasyVfOI
zhB{yi>J=PAP1IoRFU%IRbJ%St6}A6V9E=sH3p;}PIbIBVF7YGl*o=uZ_|~}&0o3ol
z81;Xm962yKh^$v?P#1g@gV=!D-fVs|Tg)G*Z{j!lF~(c(3IoibISxD0VJ7N;MHX+g
z_H7tLeYJVYtT*ptEbTAN&*neWaj_emUNQwA6(g_%jz^ui*gDKd-D!mxM*XZRF$%Y%
zKEl1I<Bp@|yI}Ekj3mB?I`IS4H}wV?-&;CWy3eMonSz>NWL=(bPj+NRczsD`&F%c6
d4%r!*S^Wcfp+HScK|-{PazlaKx==xM@IU0(===Zx

diff --git a/po/en_US.gmo b/po/en_US.gmo
index ac526b5785595a7c1cef60f21a85998bf34f0fed..99a02ad5b9db5d5f8d6a157c94de7f917586e0a7 100644
GIT binary patch
delta 1739
zcmXxjduYvJ7{Kx8Y&O?9HjK@fZ8nz;yV%&s?JzUfDMD;nCYw4oM#|-vm|Om!waBFi
zsWluF$t_kykzDczl4*4!*C?js`}98QSD*KJZ@>5Qyscs1t*|fD673!IiJY1$(nmz{
zr-{U2DaPY+?1lAK-+;Y|4_n-VF~qmgkB`hZ*q8Vd4#ddmBFUJ78c#v(Uol-g=}uuS
z73yZx33p>ZY(ibwIgG`-s0(<GNf<_*D5}^kv@a$QXW(R<j9YL!p2WYX<4(*F;gg#)
zJdtz?Q6(asFcU{%Hjcmw)B*c&0G`DZY_<A!%pi`KDKZp?qxLUDtq-F1Z$jPqRn(Js
zftmQzqo4y)N?pT5OeHQy-N|;$#iN*pk1hU=Izjp@kt{63Jluxb{}K+zcGPkH*&>OU
zhmknf^cGlQk-5|?H!ICmW(`I#K@jzh>rk&~w|UIGh`OMAI0QSeKPJy{S2hmWxF;o6
zQH7d(8&L0h4`$&J%)$FO0e>UcC<SxfPPd{SX~=wnI?q?^iIMX}#$p^6VkwTnotVb|
z<r;-<RJ=hyhEb317iw;#&KDVsC8$5D#s=K0F-hYu6WPU?j$Y`J^U7k89<)D1P2!h0
z0>9u3`Xw$A`9S=285`yQ@@l!rIQ)d;F{9kQhDy{01+hPFGY^>|)GK&^y5qN~JN%Bd
z{3xr!E#!D5$;q8H;~?6fu5=6fhF%8^NmVZC`mN?|(xC|T$hY7~JdZl?HR`kZgOe~&
z?UHK;77?GtQP_r>Y_T<NzAWT0C5W2rw@~MMRm1rQD0EP9niWr6<0gC`Btxn1yw**$
z2z5Xm>J=P7ohW4OkIb+cS?e}52(|wd9EK}U7q$=eIi9KY+{CTcu?<sch^TWN(ox@i
z05umXkOPwjWWBNn({MlLU<kFn&1^Tr=10_=_>6vx_SU&VyqRGZV0StcqYhYLagDWa
z#8~QgnTO40^9IJz{@8qH{y-hqdA-w1pb$evCU(U_)E@_|!#vcTt}v@mpH($R<0jN3
z^ian&q0V>G;tLo>d>!@2cTjWc88SXmeD&_xbTN}qC&<2B7_&FO@&44}t_35ra|dVV
V7v(j^2a>z}k8;Oeo)qYm^AEZn<f#Av

delta 1745
zcmXZbXGoP{6u|Lg!_1LcwrrSbR+@6JDe1L+(=0QKHZ3Sy3Toa6TD)x<Rz%bXDcXGq
zp<&jCB3e{X6co{*4;7Ij2+@*)#{cjfc;WY)XPjrgx0=K5HHTfQ5BH9SiJX}r5-%cw
zi6Y&w6no-Q?27BHelK<>K5p@4j3K^{vH0Blh&_nEVt<S%5J|*T)VL6}e_4Te5=CJx
z73vn$gtgcU>rfYV1>^7`>H^+iKWs%!6j|sNnt*+X({UUY;3nLKr?CAbH|`wr$=ykw
z$Y2VQMIs&0hnbjzX;_9j(LwBs^_YZ@tiA<Pi91ae8G@Op{pX<8hfw?1q3--9>PfuC
zbo}j6&;hAaTtg5C5idjC$u7*olbDPzEN(+hkX9@*9OvK&+>YA+Iu64Y)N%1sMG`O<
z+v7~rn`?yy<`Q$6xzemKtFRpjLa2AV4)uy^%~R$z)CE1p6#R$1F{Q*^*=S_ro|ITc
zIqKuvfO^;aaX6kpKR&@x_!qfO$)DzSx()S68_k!fd46CQj3^ZuiM=onOEDYwU^4T|
zEeerTe8gC6MLoJdsBdG)bdiBrf;v$p?!*Hc^JwB{a7~<P_H6e!Z_E>kru`Y}BYuZz
z_#I!;FL6HCLi}SP8)bfZzleLmub7YNi{0O_5_Lf#?2X&aV`d}j6+A`V@h8+BwqZ3B
z`IoqboL<T%xU-8mfc95qZb3iM`%OdAa`))^tr8hehq0(fz7;dD0d?R9)Za!{(+7$$
z8Fym<>oF6XP#;^*a+lAK9HxX&ANxJjeDBLS{~(2bRGekS!3vkKxl)Adljtg!XaVYg
zb*NWx1T|5kwLdpo&4_BZp=8wlg*X&fpf2nn>hE}=+H;8?S;r<EL_?=Fu0tB?e_w?9
z7RrzVlfB4#Wk2c(96~=fqP91gEoQ6v1@%pQ!&r>+YFweOnQrD|6dj6D2h6p&%Gx(#
z9QFIm<K{*44tAsch56b1g*q-e<n#tmh@rxVopB86#6{L&7V1t{nB}OyRV9YwX4FTx
z19e;-YQFOpU&W5Zw^1j4fcmChBjXb!e69O!V$3Ae1UU_PF?(`4W>nWK&pLc}LSg5e
bjI0p@eR%=j;kaO8q>FL`zTAdDu!H|U{Kn{L

diff --git a/po/eo.gmo b/po/eo.gmo
index a240dba798cfbf472e47a6e0874ebcc2f19513fd..09517d6004d24efe5674b5aba8c4c2b1cdb2265e 100644
GIT binary patch
delta 1757
zcmXxkZA_JA7{KuhUr>4HfT>AFVZZ?nJ{%_4F){>>h!Vuc7FZGmt&<J~G23!H5iLsB
zhOx2O_!h;+oD*?Fom)9wTeO1Z2dPb4YokqVYpocq+4^7IS0B!P_kBJ0%XPn<+xOxY
z?!}!SkN3ypM2_qh$rOIoA{#J>8?h48uoc(iA$$n??fb`=OnnNq-RD-HM{R!xH{l<+
z6;o<NwqPlyV^fXzl0>0{KniwaD!z@IaR@b`vzUQ5P&+Qz_q&)tJwEE<>8Sm3unKqK
z01n`1xMq(V?;P%@{^cIuWtLGZvWmbCEW`>d!Wd@Z2<l3vQCIQ}K90X*KCa&@vJIcc
z9PGj%euUY06(7Od_$dC31-RL-b04Cp19xB^et?hR6c*!6i?7%x;!!U^P4ob2qJvn1
z7cIVsI!=IP>Vy$|7+Y}#9yk3rt?-uFXZD-#nuF#k^FwpU95zSHQPjl8P#5+!>Ye%x
z1GujKzlHmfMM2Lzf_k=fsAv5G7UEGX#WAeJd1MR;JnL56hI*;anCDUZ&!LX@GgjlD
z$Z1KWL4@ld0~q4|$t;B=0?U|!s~g?fW}+TJIqKQ9pswHqp2i`}TgCl&j^tJ{Nwd2v
zKRxfp`v-N)6I<LJ$;Dr3*MQ5!D_&#~%r9jJnFRM@1p84Fx{7J|73!`2!Cb;a)B|lI
zuVEi<!Cz4O$G=3Ji7HXYnS6!a<j`kO7nJ#`yL@HnXVI{of^KzR%x&=`?xcPni!lFn
zkz8!XD4s;!((9OwYsqE@2C*1l#wYL$@<L?>>+k_?#M;BIU;AP9pQkAA5V%AlvzSAD
z;HU`4B@?L6ZV5H>v~G8s!>Bvbg!;V;^_jkpy5*muCh&#D7g3+-${yFg2=)0!d)R*+
zI7UD_oHnOWxAYe3z)Kd-IOd+ulSsbu6o&8_i+7pbW-oF@<OFJ>CovgE%yFNBUb+hw
zxQ40J=TJNRX!XDB`?_9tt2dZIbEjF40s6IJ2KHF}J=BRuF&!r`6aC8+5-5C&N%%c#
zgGJQLmvId~z(ibq+||=j|Km5ICcMqug}R^yjK_nh<94ElJr@52=@*bmSCA{H8O}}z
zlRLK$5ATkK%R*i_+uI%~Eh#MVJTIZKA=K3QM(kMZNLQ%3y|*)x9rjAfL*D=G!sXM6
IRo{jG1ya-K>Hq)$

delta 1737
zcmXZbe@vBS6u|KV64aGng8aCMaEVF@?)8c>5G?d^xup2B*|1iCQ!&&TLFj6>SI0t{
zzgi4*quAJ5i{?g-MYcJeTeVu7IK|CBLbqzI?be)sI4!2@dwkAcpXZ$SeV+F`&vV|J
z@r2oU!q=ZCd*cZrZ%0HHiikfdl7}J8#~5Z}8|Gja=3>7+{|wWJr%>Pf-r^gm@BfZ|
z{1>0W>_(9ytic7?(kPy!GUz0cjt4LUKg2~igj&!!%*LNlC(hdQJLn^xA9ML!)Oky>
z0i)Q51Na4|Ho5gCaXs-bO`fYP|7DRR5-(yoMz8|+V<C>9?&Lh`POjn8cpsNy!CH}J
z*np+jgJpOc19%x1<8N4uvQFfA2zU(iK{M*Yowx)~VhK)R2ya?GrCB6QybQI_cGN<T
z<8u7Y@^RF4^4O++upSGr4HNNw)BC^%hs{2--~7ltZk{qfF^9}E=7>3pTKE|1#;&6F
z)IH3?^bL<U?nwy)z4Ln1yWNC(*W0lidvOJh;TpVwtRZ<D-HvynHr25C4eI<E)b;+t
zDE^1smeg;ev2g%{^q)*KNG0(Q)6uut-K`(>3Ra<BQ7h^W4&gBz!X-((vqj|7c_M3H
zb-nWEHn-lq*W8h3qV`BR{=<7)@d0t<O-_REOI@o-HEzUO>_;u=GG^ix)ULj5&f#9-
zyf%@yun&vyZ`Aqo+sX5x80tC`J4D{#(l4NH$lu|buMWLJUhH6?N8Q)yj(7s=i0@(r
z2KR_Ohp%G{kDwmuPZ+>7s;R*chHy7Ni^IqtDi?4aChl`5xB&yi9s4+cenmM-;yi^+
zV=3`K7pH+|(T{VemFK+Uy15$lL|Rav_n`i!Cs4cmE7SshuzVc#3ZCqC?=MIFeVe;E
ze_eP#37zn<IfZ(pzoITYXZidd_xrqr)GKQ+h>e!-F%OvUAuS?@PzybRX*gnzdknPc
zzO}@Um_a;)I^hqCAKCNtcU@N(njv$w`3hz+ZzpEsL5q)}es~lY;8|RV-bDsJ2G=na
zZ=t>rN3HxJreI<(jfFncI2UuU2({oB%qZ%Hwqi2wKwWnahVh`~zeMI`$%GroCDaP1
tC(F`yRXq{x>fTj3crp@usw!ByA`o6#8y=jE6#HCMQyZ?COm4VV`9JB&<L>|f

diff --git a/po/fi.gmo b/po/fi.gmo
index 4b372a909010a01eb7f9f9cf5c07b5749b5efbca..c28b9e8eb82c5bcb7452bb521e57106949e427bc 100644
GIT binary patch
delta 1757
zcmXxkTWFL=6u|KlTeT*}m>X&|x>2KR!rE_FHwkNNVNG1?CDACNMWY*7F^y&^*(4Hb
zzdi`D+SE&=NJRwO2SFNRL=Y5F3wh{^8c=)^lnN3NykMkNssG~~VcFlDGc(`JH*<D>
zdY-lKdDg%m<NQCfMAC7QLJ=vg6)DCrPQwIF#UxI_ZtFj4{b#U%{0;LC<`X~0Irtxz
z;><dcGW^19!aU+1>%{*s;V_9@5~p!84&W@jj??i0>IUDTPRw5}QjTS);}fX;n@|_p
zg?!`}zIyNuUdF8nHiOevh%{o&3ST5b;~<Go@hXP#FRa8@7{IcxMdo1~_03vvF81O=
z97LV>0CfX}E8YAk>PC~O^LkL9a~5lG*r%aynzKq|Hddles7IZU!4MwD&v6L9!cnZi
zs?~0xB<e<bF^X4E=e<B(FtA3X1QR$0n@vAujh$wz*=BxcX3Q?L8?`p}qSnT*X1_Uv
z9{KyICzV(4#xF*_!ZkQUxc{w|=teE31E@uG5`%aS^@{Ex*C#m*B79^$Uz-0N19;bb
zjryFaYegnuCF)Vfa0#|!4A0?Q)|U|)*(CDTxt*1u?zjT=DjHCWrUSK_kKrL4#2`fz
zZxreKM5J}2ND=w}H@k(4zHvuB2R-sjv5fI)d_#Psi5F#k>D?w$ho_KwlSeoa7jAde
zy#(`#SK~o!!k=*j_hVPmEhNqS#E7Tk6*ja9^N5Rgh-~E2%W*dG_d8upoI*d!z#$qz
zI^MR5a2Qg)OJp&2q88y<^CrfLU*b}%+U-uN1D6s1hFX00QRfx4iPT~Za!9flOYjzI
zQ9fzo{MXYcNQ<0cBRf!!d`!E$;~;8r?Lobg!>IoU7tPzKe^gIVuV#G4jW5Uf#9yNR
z98;*jmLBUL#973DXMEQfu|#%<i!02Ps1N=Ybz}RHlaziOhv%^xFIoPX`O+LU|3!WC
zw>TN6bh;}I`ZP2VGgqNj?-tYvX^Rh7|4GzZ=r^yK!{$F&NdGA6bF#afrKs~fGmg2$
z{stPK(P+jTY{g>iLW)&-aV#E1EvDl*9?zhT8$g{mWc|aa8+eEla1?bTvPWbQ6r!G7
z0vT5z^{ye!s5|Psupl=T?dyv#k5q-cNWhE67KJOrp66w+Z3s1{I$PRX(ruyIWF{30
TM7(fy$on`hQhgz3*$>h8S|;m~

delta 1737
zcmXZcS!|3^6u|K_Xltw1-r8ENr7EMN3|&yBn`LaR2ohUGE0(sXrIas(AWEeTA|euL
z!i%IaXkvK~u_S%)f+iJD5<((HBE$&($34lkzkBYz=ezg2_skso>O1w-*VY>A-SUal
zghU35NLrD|P@I9u7{(;5#Np`K_(dDPiG%2WW_IB~;?J0le{nRX7mJL=dFCceAU<9!
z-v5O2bi~tf9TV{mrr=W?iSJQ2*rUWH4#V-p6Hw=eQODP!F0>Q*NDKc?U>DxUic*m=
zIA*>`8P1;XiDc6_M@KJwj8pMBPR3uDiW3&_hoz`*R*mDZ8K+=7YTkR)4J0je`FW@t
ztwhahM14*h=3u8sL*F!U5yy`K)P!=>gnIPj70kj8EWjvcVt&{yREfHgW(?vZ)Vv?4
z3yxnbG6KWc1FKALt2K6*wdQVfuUT(4m>z0v97U~-%VxyvzySU4P)};e5;s2=_3q1X
z6eT4U*5RQRQxj?tUBe8#je13Ik?WJhr6PP}75}vV2BzX0^Ec{qMlTZ?fC1E_F2H=;
zk9l|-$FaV2)96dbkmYV?DX2TnLcNL=s6}%CwVE$s6SiXpMN?Wvq4gB0UCA@(@3qD)
zoQ!(p85qDq9LxMVj1pg1$BVMQG_Mya##W@><P-MCX&YR1&&7en%keaB!ba@Ili0A)
zEfiBBGK)ABAF!ddm_R(DQe-8Uo{4G1N4B_{Xhko`#10x64EVN-a2S$_)A1mtW1IOB
zL&QIE4(9K0Cv^Y|iLas--#gU2<Z6*3oQ)ik97R2mSExn#rJD0Er!l;S0%9ZEP>(!r
zx4UCMYH=Mxy^`~&zX$is*Qh^K-%zinf1R73i4%!Ks9(pesNa@G8*j%H;um$EYjj&j
z!X6iAnM+Y0T!Xr?GssCw1Y_|o&cuh-|K0p)M$JE{Z|>Xcu5=XYmHIvFC@`0yR_{jC
zggT3xZ2TH(V#Iu6cA6h?Fym3w=OpZNrlIBq%~Fgf_EyvAO`{6?VJ!~D2BcV}8DsDw
zYB62GIJ}8E?+$8ShmCilZr}s<!6@oRV)j$en1p(AVPxJQDR&L2Lfz59$fWqq!5Dw-
luFcskXG0}@g8uAjse#<QK+D@uN?#Y{<OOmfv4w|&{{YN&=9d5f

diff --git a/po/fr.gmo b/po/fr.gmo
index b9da4525111a230679244ed9fb01f0366011dbd5..d577ec80b2bda3000cd8ae19d345960052b376a8 100644
GIT binary patch
delta 2053
zcmYM!e@xV69Ki7phe7-nM5NP`Ln17=gd;eCDR>HUKVX{RWX&wmf+lbV3L)+Mqt*}I
zTKg_r<{G1gGpf1Jw$fEQXSi0bbTX&>Ve(JY%H=<fwYA<KzR$&W+w1u}-{;5Y`E_qU
zNI1>!v!v)R2_hf+MVulsut{VYzJmpL5_510m*5TKU#RUIjUtQDiQ29dvvED<;}%?n
z-S`L|#bO-CJp8FqqOz32EEPJ?oH4aYWI6G2)Pa1c32Z@4bPwvlQPc^?Q2U?36?hR_
z@iv~oip@-hm$3*xY!(UNcg<0e)f7^Q7NHl{q7SPvf{)`#EWuy#F`UCfbO%K|=r=}C
zC-?~0U<|e2ebj`VA=`CWPW)Vyf)4a9mf<8;;4RdSIbo4XtVNA`u^x|M8BU`nkk}$p
zhZVREdr&8sK;7~g)SYv%Es5yDhcH@b3MEF5vC>#$tT#5IgN`B8qiMx2sdy3fPB^#P
zdQlSz;-mN`YWvSI8-GAI^UHM#^Ji~9q&_Y4cVY#4Y3RiU+>0Eij3bMYKk+H7+h(sU
zVmyMG+75H@EN;L{sQpsg?6cp2YnWfgC};v#Fau|?6#vF2(A7SlsWhV=RX4thNAP?0
zGG)8S9sIGwUg6oD_6jefi*~ngCH{-mv~xWxa+kR6c@kuPY1nO_={EEeTbPE^n1#1d
zU&DPYz|2mO9rz@Yqr8E7>u1o1b2yX8UDzX%PMp~#(&b<b)XV$YOZKIn!037!UZbEH
z=Jty4GNck~a0DyxD=fm_kzJScKAs}(LOt8l=*MfQmoPtKU)DC%b|XkG@-wbN?|!>q
z`+oL6NX0M}vm|m6^|_roV6W^d>K3j(Xb;$A>_r{u7`pLm)Ro;pZJ#h`A6)_J^9~yO
zQNN!+ZU4<6`>)UAH!AcWDtXA>i9%xo>elW;Z8w7CDPzWQ)MxoA>dLPmJ1v>7*k&7Z
zjmuD<p%a&2Rn!y$sJC?|=3>OuzmD4B0~4P?ZFkAUH;wmD`y~$B1LtEVaT)5RuEQ)0
znC~5!O&sl^uv81Em*qXw%QuGF@e9;Hiu1S#W9Iu5CKF#pUCB*Te-Cw{e^4h#J7o8F
zp|&eRANnv!*Vact6F6u*iaPPwWKG6fRo0ZhDW%#|?sb<})mB=08w*n7k=Hj_zcDQ-
zBQ{#x@Ai1Q_U?<sMy>WhD4Cjlos>TbgwpkEY&3Q*Rf_wqZ-?@%#lh_l$1AOdV6JsI
z_(GChVciK9#*0}YSG-tm7j?v~q0)Hm;n4Z{adddgA1+%62Ey)z;COiLLU27?tKD^^
zyq58m@ia)S*4-Bw=<e%v$0oE^2c4X5$t`hQIAz@(cm^gn9~e!XUz&dVW2hq`o=IT%
lf#bsa)`mlF&;KJ14R*df(ATrO)*eu|BX&*}YFpdG@*g&YauWam

delta 2057
zcmY+^drZ}37{Kx89BxYl<025L{1i_HcoI<&PHF*aayYOsak)yz<rp}w2arp(vzDw`
zu~kR^5!-Av%FyLt)dF1wwpy!Jx@v39)^fAalo@mAx_%$ump}UJ^E~hGy<dK3=3Fn#
zxz3!54S(knd81S$Q$+f<ilpNa%)(Qcj9+33{%oB^trxdV<W9^&t(T8UScVx`gDbEV
z@4{EmgCm%R-)@tzEGGDk0`2G@>!R%<cauA)9c@CLKn?0dn@~GGggW3`sO>+*CHMta
z;T1fNg%7a^yolL&VuwgMp5GA`xtAc3EE+drA#TF;*ois#HtNhT;5~Q~mt&S+Bo9l_
zi!G=F4B7l6)OJ_V!ITQ)dc2RkCQP6m9m3T(jBD{CuELmr$-Sr@?ZeGDfVnt@d3X))
z$IMFeeK+a=M^Gm;g}QTBFbdslPYi}*ZLrXqY|XGPv#zw}qML^Ks7JF7M=1!P-id!7
zHl|mbiLAkul((SPe-)E(1Rchga|C*Jm+Xfb)H~tYDN=yx_#pa`<CGVXMaTuzBXS-w
zE32`#W1`l>WITo?cpA0c403w1d6&o<#+T;_bOIk>0)CFVrQf4&vAf2cnHTk_s_+?X
z$B)^|YdDSX?lCJo_JmpC7%rvWr??D%#X{=2_lo>ZUR=ur8DBhgA`f5@mSQi);{-0k
z&rn~(5156s_$a2-i!euNM!of);6}WJKSlAx8blV7&ps*A=q6}1m$&JFxzsOXcncNB
z33P_HT10pmlF`cSuol<i5N6|7$gazE<d|h^n>pK~SV}&QdI|qVy}ZTkrd};F7a7GB
znBHO9`8wEtKLz_J_=SnQgE{0cb(@vFkGh5N2Tg}L)@sy_`q07SsL%2oYW>TYi|!ut
zyuH@lsNch=^<V2@|Mgj&r$GNu)2KTU-D}K7-P%&T{rr%5%7FDS>PiPuckDgXou0A&
zVZC9!iTVux#1u>m_n9CU^|o%oRIIk;`%xS8+x#eMy^}USYyAeb-DR8K!bI|fesigp
z;3D!|OhTVE93WUs!CutM(uI2Yo<)5PgQ!1>A=E$Q>-PIF#*vSru4LSne~miOkEjDp
zqqhGGwVwMa^M_5tSY2BsfqvL!ZA2aT>9OL3!y96}?V(^nWU_So9UHs_>zw>zUw$O1
zENg+uihKq6W4^NZ*m%d&>3F@3!RB@+va`G*#_=@QJCQfbE28yF<VJZYR)fijNQpl+
z@|=IaDWCB#_n7hp;_37`ZS7MhL$$39L8qzpU~O{~!Q{y89*QfL(u6)AugEiP2P@8M
zpW1zOVD)@B5OC(h(}AM-@M^$kT6-&pGtGc@ysoCURx<`2ja{!yUF8Z!;<_Jm1;-k?
zPekcLD39;k<1(Wj=%4fVI-Uk66zu43>dcX@P;EmnB)u(lon37`^(?~7cydB|d+I}7
RZ7p@Chz<E)SyfFy{sUNpR7d~-

diff --git a/po/hr.gmo b/po/hr.gmo
index 07aa57ed072402af27d6a577ae8b10757d4a667e..fc387cb3d1f28e11911ee76556c622a785f44014 100644
GIT binary patch
delta 1757
zcmXxkduYvJ7{Kvo%&<Ae4(7h!#xQm`=gi10?7|qvY|7YX*lI2tyG5B_%AKgKTw933
z5VH6~xs?4umR$ZBr4dmaaw$adeR^MieV*ri-{0?jf6x1zb2t>%5DL3;Cc=FiCQ_Lu
z(qBaKGelys0tetujK-6w^H;DR-nV&&o&SX~jCaoz>4Sq&-xI*$I0yCl3LJ*JP~UqY
zQ(WmyaFYQKwqY-Pfdla)>VsWpnGGD&4N`CjW?^3}Lw(N{bnpQ3O>!Bx;#WM58)ut?
zd9p;dlP6}mB1r_z420t|OvQFg#^^aB2{;u8V=+3o1>>;^$KY)ohaYeR4w@_C$28RE
ztI@$jHot*E^5-tWPy$c3$Vg1a(U^yE=%No#puV^bQ}8<`;i!3LeJ)NQuScD4!Lj%r
zwdAq$O+}|*XYwUhx4;HP)|J*W>l$l?wF*1&f;!YI*o<14!`2q-W7G<KLhXUL1?DO<
zP<x{g9llR$3H0s`*#+lNd*H5FAWu+B`wjI@hvgW{P{+@sR<Par6SXH|7mD;mA5Ouk
zI1M-1{5m@9FJB3wnD8z#%@v1Q`tj&s9_p{57PTo4Vm&tFTWUEfSL7)6Tw*ppx70NA
zE%dVPA?j6i;9b^57Kpsl@j}+KzqAyI%)kejj#0(tKsgvqz6=N8TGTJyf$S+~a54Ts
z-6(s7`NCqXW1}YQ!FZq5BGb9Ec+?&$DdW(%8{IEVTqTHS;B+}1j;%Nz6W5qKEI@~R
zAFjlUSc=hWO?TI#Hs29U#z(0C6Mt|fde?C{%*O;gg?fN{>!^PQL5P7iP8?is4k8;x
zRxzG{`upFB4xT_g=p8%$8g--J7>6-cW_=L#OS4hOt5BP;0kx7hP@DI0m1|D)*-pe%
zn-?UbmO2x)yH{f(ZbJ$tXRXcXBfn(x7uJ{7SJpSEz4H#W`#aT`gAa6V5U^&U-gz<V
z1C=)4Yv+%lm+`CCR%^R8guR&$t2KI2*C*P1k~JH(a&93(H-Z|B!g|!7%^nQLBiIF-
zuos@j2y8+9lA9QbPf?$HiF$w#>bk$E>muq*j|@c}&qodxBg;)78_>hV_G?L=($vPr
zv{}IkK7Y{hr%p}@j0yPt{>X(nzTDEf^6K)+3SUM^P3dGO=nqWv`TwsAPP`VCzCYz3
D*QD-?

delta 1737
zcmXZcdrXf}7{Ku-Dwm`yl|^s5DSmWO!rXEx5xI<&5vhza6d~hX&1}eJvYDmXT8vFX
zv^D-<E*l%h%;gWUS&V5Tw%9P=XXpI&d7g95`=0YY=lT6k^mv`>@w(FD>wfVP*^(s^
zE+U0<M8dENBk(W=;5pR!8#o-F*u2}$|HEL$ht3rV#c0&`WMC{VLVdmpW3V3ey;tUn
zD?tRe8SuyF7>Mt21b#<-aL7EfK^*D^nK%;ja2S@OzNZ!)Y(TzAuH!!J!$z#mHU|sN
z5!p|kl;esd60|Ykjc+g=yKo$a&KDVtvoI1%(7{@a#%3Ig_izG!!+3OZMUpWa_4!@s
zV57}%VJi7MmtYh@@B)zpOu-~9z$o009&AB<@pDYW-<XJ=g=YOq%pk8ro$ti)*n?W~
z$UIZgnb@CvmDMe>!FuZkYq@ocwaU5^`|*N3s8_HLwK8X{oz|DA75IVL1F?(DRnAB4
zjbe0!`>!F;yKA%yT2Xu8fmtB0P)qv@^-jkuHkPA~Uq-E9m-R1dPekU^keG^7aTZR)
zy*9sz4*N?Vfgcm$OH6acqLzL#I#_`EYp6kO%9FSk+pwEjdX|cu#*h_e<JJPx%y%(_
zb<a?*svGaHE}&54la8-uJ^M@N8j+d!6lY^#kvY(E3?N^N5x5ogOAjG?%0*m;e^58d
zUu(Xw1gqJo8HX?)Q6e&fJBvr{p|Ucnh)2-<&O`@6Gy@klitsLZgcC7olexnpbjXim
zF<!+|3@ta^U4z<uO*jr;p#D#IRZw;e#|2o3qwzfI0UlOR|2YJ`3_Rw<lQx@!_-qqd
z&v*jr@Bc75*n)b{`*!>j>PAv&t}G07{Up>c&9~z_QJe4-Y9()>Ht)+y*PQ65od~Nk
zFGxWxbuMamZ^Sq}fD}wFS=-P<e$D3Ztskr(t)EeQ=PPRW57=%F9_88~!<vVB=Ow5Q
zY`6I_JAW2K81Jw?vUXW}F^GBJ9ma6f^+`6LZp}xnoLfvVkYG3ZVIAtv<|uk&6Z&8?
z2I2+u#ZJ^Oxs8MIHR^L8P!G_Hy3V`Wtn<SR@)*?dLgZk<vd#pu1O1se*q-QLn(pJ-
mT3MRfa5QV)pma}anv*<vN^-;7tf;{z%bb#&+3q{LKJ7owFzSy0

diff --git a/po/hu.gmo b/po/hu.gmo
index 737417f1c3cd30e5f04399283e6b8549235817bf..f022e0e8c16dd9b818543625d39d18c972decad4 100644
GIT binary patch
delta 1738
zcmX}sT};kV9Ki8kq{&-K?<G%plG39$PgK^{t4i`Z?~#c#3}F%WZ?UQ7N@L6rxnX8)
zjWNwdV|lsI1!ltq7P?S2^BU&+bIx2m`<&l-p8xs(&hPxrGdS!sFznNL)z5k7BhryC
zGD$>Q3q>OE9LC{I)cF?}g+tb{MIzC}2^fln7=~*w7<XeNHe(ES;1ujZUH1(J;izJ9
z{yh+0Y+mF+eJ~H>aV;ib6Hdk}s0rT3G<<^-F?gOa9yPH{EXSpI65Fv4XP1a1<LFY6
z<>)PSL~<D%W5O37VHx&e4n`5oz!j)FIgGl%MNGiQsEK^TOiY~52dgjxTWx#?rxAa^
z=@>wE`rbJXgQ*PaQNK8YNq84sID}a^ae+t*mZ3h_fOGK{>WjbPZ1hx^#5bWPZ~@);
z6t%KHaRi1eG&<pS5M_<A##-Ih1Z$GjgW40Rs0)`{YphL}%=}r@1Ri2I4q*U}Ui9y%
z90_Nj6JFGXiZBqX(1UeIzeqbS#&@_1=MZQGj-&R<W9t{xrj1%6G67SN(~(@Hn9_o@
zgFHhI{U<R?MaD8wj{4wA)T7vjdNe0cyY?2k@FiZv-&jl2v@a9+I8tN`S!qSSuQeMA
zt~AfPF@yOM+`{h<qMKXSzk!YNei^gTWEhPcqtu{Q<T?i7J=DrP$C>yUwWM*?BC$9R
zwY0TZh)tO1E7FVOi2Z9twsYvAsMqkwR?}mb(CHjW=@@9K8+VvQu3-xC57e$r+-bUc
z5#|v$pq8*3XQ1yckpfIbZO%QY73)HBkY`9yB&W_?<5Q@;aifm<a}4s9i9aNgx!YVT
zZ@tK7<}1;ScTrz7fSPE?K2wnb)Sa(Gy^i&$FFud@`yT6{HFCfCz8LkI*6yeNde&`B
zsNJYL?nhm4T!U$@S=QA^p3;a^SdO6Xqy@9^22yGHWc_UYYW;zF1iw)KDWjbO<}WnO
zT7n^bu^xkPFS@YV#+NaSxEmw!35MbjMxft8qYEbyXQQrDVdD)LNW9nT9A%)HoJMVy
zYd9Wnqb~3Ob;qx86u!m)e2@P44WrTLkhw)MsEH(@Zln<PcdJnosm57YkAAv`s|@r-
pUDjUI1YUGyjc@U`_2w7*XL?f8U8&yejJD8%DgUGNuH1so?7y|o>;wP+

delta 1744
zcmXZcUrf$X7{Ku-r7fgCN{aNRl<2Lz3GbW#B~nTLjZI4`lmBu-$$oQTX+yI%%*HJ8
zXEU;HOw+_gWBzo(1!lvAkh+nriTFOwx%!;vyuaT$&w0-Cd%q6*4GjCW-3oO2{6wxS
z6PX|)O}Qe`cm=271JwBsI2i}6q02?45U1iq%*QC)iV=7iWAGGC#Tyuh-KgvKVmOY;
z6X*X6v3X`A59*6~I33F|85=Mb@1Q359A{%MhGO&z<4n}Vvat|1;aP0O9$c`Jq%k;O
zWFz|W9g#&0&M*;xJ-7;AV>Y@7X5kjplbk?Z;5sJbE7U}O<6KND5J|x*%)}-eKgJ~D
zew=|3WT*QsbQmNss7L+bGS0*&=)yttVq}p>Iu@h8=->kEMBR88=b>k{Nqi@20@pAR
z-=bFbFOI^PVxtpl2QF)ZHOZP{O|_<5J*YjAg}QKwb+@$vQ<-l;P2eR?!a)qd;5GlR
z%8^(GI^jcIXcdNG6}s^d(l64ACD@0XaUp?L;2dhNyt4j6ZCck_k?}YOxgE(tiYcd&
zc93`IrvD^ioyb@wN>E=cMZJmxs8@3VwQD=kg&(m6N39pBrfFKS-=9N}l~&}>7IUEJ
zQuBTaW-?!dJ9z#WCi2yNE9ao>FCi5s!+7KxWjAU??qfJUMXk(xOv546k|tM*#A6|9
zY4>6-HsI0#k!LuLczm_U9xi<{>Sx%v%k<byblUtW9Rn@(@qH$dc1$N8LG9YK{idro
z;8J1-wS-+b3xf_&Ud%#m&RW!p-9vJacSuoWNsal8FQWEFM-BDo8srNTBP5c2(0o?D
zLn7Om--e0!1a+eU)I?(rn~JPNJ$VJ{=U9)r@m194yRAR0akb|60@TlRZ!PuLyFSl^
z+J$=JZ>S4~)tTn<TFa0;<v3DdX+%BAY4l<TQfc{V9kLEvM^LZ8?}+)QjCUAJWMZzh
z2qTFrF&yjAg{N$M8>5K3Fb3bCzCVc3IJVw69VZYkMqOu}jkjYMah=sU$w2?JFQGO|
zI|k!J)CFFkp7;}v#?Kgn-!TY(;}i@$YQCZb)I`!z50a1iTp4O2)i?+1F;LHNmw|3{
w&-x5Cfe-E8;Kr=c?)^1Yp5{l(@`AG5o=jJU*O$>8mJ?^A`M%6{Z%&)<AE~GB#Q*>R

diff --git a/po/nb.gmo b/po/nb.gmo
index 597f824f9a1b5bceb4d77ee150eee7faa5613d90..d081af5a4bea1c043129eda12d3f92f9fe091f92 100644
GIT binary patch
delta 4033
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
DJwzm_

delta 3875
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

diff --git a/po/ru.gmo b/po/ru.gmo
index afe129811fa2a981a2e7fcc43edcf18fce3b8e7d..0d2ebffeea62fe129125f5eb63aa961b9bb29ab4 100644
GIT binary patch
delta 1690
zcmXxkduYvJ7{Kwz;+V~17)IJ$#<0V2c6JRr+u6<C%$Q9?jTEz+#xlp9H5m?@TOvs`
zIW>Qv{DBE2b1RoAC70YOillrW@9VG6`@HY(ywCGKzxVuJ1w&p0LxQai|Gh3EC$mI`
zibzei$Z%}NA$S=F;}eX<?>GXZa*XLXfOs+L?`zSEhtP@7Fdaj4MUv5n9<0M?JfAE6
ze+h0g5yix7>u=OTBJ)h5B#a?0vDRS<@nO`&4^V&q9pf-8pTnRF-{C3zicM2QCgR4a
zBA4*WRKLh92DQ^fy5dc&#ydz;#5>)bXbX-eZbv=IXLMoQ43Sivho#tL;}7U19x>BA
zSB6gFX4C@PaSp!sGtd@Iq6&(VwKyBE<0R}yP=a%C0-i$-Auq5PM;DMBH{%L?imTDb
z?wQzzn)n9}!{LSIpt;t-@lcOHgoSb@)JkiOwbojPm8{pJp7;yKV*Ff@Q8)$lWR<9|
zq{Vs(#}aoUHB0v*V=<NypDE%FY+%rfV`SiN)K=fM{zTn)*nE>HAD0qWAYGP+$lH>k
zw8Mp~a3mhH-oPy4kEri{`~uV2l{kU;>;mpUSQnA!Ow>9=-qP>Y-MH0DOd%c1MEdjK
zFVqcsFBjpDAT!X>U1T3_;`fKjO^XLth^%9MGOovq*awqnUti3}NL+|HSng+Vj==>y
zi%Y9a;)rUIJmM5=q#!?PYs1;SklX4+YL-p)#Mp_Y%#Wv?<A@tKoBb}M-i@*?=5lvn
z8nJJy$TjrWGYB&9ZZoa=hC7Kp+f4yiFqyd94mQP!cm{8wZdAp?UTj5um7lPcf>$<}
z`RFF|d<n*}-gS>iB91{1`DKwANC4d|+(J$G8}&Qj-fQm0JWM5S#vJTGU60ylo=-#l
zeFbWQlh(%=PaGaFcf*5Pcqux_F9#UVIXQ~icmgx=jh&C*&*_Ps=)gp4IwlflqMmFG
zj>03DfY(tIf5m|qeZc%1+!#%~2ouOJYZ>UL_LN<?iu$fQt$(aB&E`v(iGx^Qg1vA(
zM&d5iLXKfiY{%YsAN7;|62nkh%z8MMMG+5VpbO(rD@((^ScoyW+`0opiBF@pK8OYQ
y2(>dK51K-p)(nhbzMw5Fq9G}8Gb^`8veV^`btR=I2KxJA!v06@l(r0CT+v_p+Wh7K

delta 1722
zcmXZdX>3eU6u|ML(W234QM5v9soI7yZM8E&*BPa1uc8q<A%eDONb5z_77}G@iHapn
zgr*o<!UrV%ASy^iZHc84iC7Z5goOAX_x8*0p8M{5=iKw|o4yK#y$OYdnj)M>?L-=K
zMEZ%y#ypV$SdV@1Cicb`n25h{AjbQRnb?zf3F`fon1#pCg|E<uQ2~+Bn2)LGU>sf!
zi1R<eeI{a=cyE>QrjQ<}34NG=^Q{i16CX!S`~>y>Uzmhl@<rBR8ot9u{ET%IM8@E@
zi6Ymqd7>jSg+XP3NPE1C<@f+;iufm)9qq&+#4V^h`G#&BS}2l%C0K%WHvWuR#6u>V
zbt}<DT#s5{3r@#R4g+mb4pmT;RN+*-jbky6U@jKpD7=VlLf+tP95GE~7Vf|m_!8G(
zK2OiatEh>8V}Bex!)&y`8Vq$D?&!`}GZBX6)(zH;)=H~`rL3z)-T8M+MAuA_WSoq;
z!wsmf=BV`s4kK<uYM0JM#(71Yfu&5GV`4LQXFHh~L~Z#)>mSqyCl{MUg}8`#J<@G?
zio7)$L|fcghJ&!ddIxiezo4Fh)H$ZZrE@p~qnJ3)L}WXW*H{rD@{zu;3FmY#G=;P-
z6Y0Uazo-w0T`rP`(=noh$RXUq{l`|DRwu6Ii{g4NR^oN+iay%c4GS>_7dj0549f8=
zUc*LQUS<+^Ef@VDWDM@6pc>THM)UL;ygLt4vuv*-#x^WrK9zQkAg--8&%23wMpkY$
zhrAWN#7=$<p8|tw455FUY1L2MN$lNj3TVdB#F0BF1herB-a~y*1&g!r0_v;$icJ(;
zy35S>-D}p*$0V+Isuf8gzl>y%%EV&pVe}B+Lrp0A%<n-u>e(p446H{#w%Y6Q`_1}s
zsQ0f&63A)ma~w<@9W-adi(c}}0tOLWID&LePGTOO!fgCt=UsIoY)Cw)>ocsGm_i&t
z-PtBg#uGRkZ=)vufxWQr0rNGaV;uQqF#}y#h5D1*s2A`S>bq{Uh8;BVKulmhfbqBt
zyWkd#!F{NOG+<|J!DxJp`qTavBQg9C{nrK23}Uel>V*{40>)uCoQ;}rm30qxByK|e
zpK%4J;WO0E3_ENJ@mTXPiuqZ{NAmwm8j1W}Du}8`3wNz8Tj~im=L9;XxjZR}Zm-WB
TjLA)iG*O1n?Y-p7O)B~a3{wGE

diff --git a/po/sr.gmo b/po/sr.gmo
index fb3c394ad7b92370482480463d384508a01fec8e..362b288a190ed4587d80a825ed5f370020dcee84 100644
GIT binary patch
delta 1757
zcmXxkTWpP46u|MNRgofTwWX!n<4{U_+V7mB*BQcbl)9ZNYLL30iF+GHC&rj>Ox;@5
zq7mZKq%IGH22JRLM7@~`@gNaAxI{ukLp;a`lKC%td;0CQzsp*Ce`|kT=VLn0$6Ptr
z&+Y9aQWFvxE+W-okx{rE$Kz=nig(b9&v7)yP7@h}*_eV69Dz~Hz<L~uXRs7|Y#di+
zVjpHQzqU-=?}_&_k;KF~)P!A_iw`gxzo8}=Gu;?QEoc>L;d?L{+i@IT#|`)#pW*Bo
z%(Kwka*-_Js+l4u@z0sANFjsNSt5Ngf)pzYa5A323HTIqFk!Yx3I2>htiy?T5$E6=
z{0R#Q^gUZppYK9H_F@1t=Za8+RJsiE8JtFTSMJ#hgCinE#MP)TI*JZHMK(hQR!{`a
zM=jtGF2(z}0LRZW3ve-?xEpoHK41(cRT|wPc93RGw`N+s)+}qbH3uDDl!uyNxwXZ5
z3$>8<Sd8KMA|Bj{Y1oE-;rn+n&}MjRFU0edHsNUGbIA-`f=6%__TsNtu~3AsA~#UK
zd2E%@hx)!nsJ-+%>T@l)9zWW+dXY#0`K6n|NG^QBbWHulbZG(V7T01BFI!*Wed3hG
zbbCLMS2!t-0#=w6hN5PLt5JJqC(?g%0Xw+=BQB>I+c$DQ`K8Zhksav8zpxDxa72wc
z6?y0(4&ek`jg#;=YJx{N3}b8A70kf&IF2>yPBd*}aj_zoa4hlJ?WUl+=uV;Slm9R)
ztRi~{H#A}dOQ=p0HK6Xm9c;(1cop0JHqBSD%QRmzPG$Zr7GmB%95IX{DdZ(;!PWJq
zIUDNP|9wpKFmacPD|egonbF91V?K;p@lDhMUZL(l>H#x92eXK`VKJV>QTPx`@jooV
zV3Rprn^50(4U6ze6D!e52Ol(lv~p`L(w%Y)^YLHQ7kx(kPXwEd#i%QuXyaWNL%i3<
z4c2D#G2e<>@NM+sYnOrk+2UKwH_pan;&RNzWtf5oFcaIYw=s?Q1$yuc>dMm(87JdN
z;x(u%-iwLYfvMPyT7dhQfhPQl37B};B=TZ^;t<B;EYyTmHm*ev@eWMHQ#c$uP!spy
zKzxU~z|Y75lc7gMI0RCINo>5-nSnH-7Sh%^ZcwzKwKY^0DD*i2k5f<@^yl~;$BD0q
k_$s4y>$a||+3X9i{4HAQ2{`^DpY!9sKvCy_sh1=F15QW)4FCWD

delta 1737
zcmXZcS!|3^6u|M*p-nY}qN>{JbYT>ePG^+qprL5BXf3Ux5;D|MYeXZK7)lUjT1to|
zmQp;ZWgbZAgGBoxREP(O?FEq#(O4dY_#gK^{qDKn_uX^u{m%DAE<5gCcHF!a6Y7o<
z*-$8wEF!_FBAK`oN8&|H#K)L{?=cHwr-=+lHzr^OreZA)#RKTVD;U5o8^;xy*o$e*
zuPc(!|HOxx7{J6e)P(Ig8eiZDbQGHeqpT&U1+7Fa{2&g*R?NnGxCY<jTbwhUc{Z9`
zA~KA)x>V#e?k)|9jAf8IL!>8GAjQf;oP_6a48Frrm@rc$A19*^x8p>-fwS-nj>qu?
zy3Q8V=i4zCyU~kTWg^rdRUrmB3@#$4E6?nO#Bz~w#6i@BPN4_iA%`OIvqdK00@MPI
zV>Ld<3e1^fHn10Sh&xbE><2n<@LXdk*$#$U)2&%nmvyAoZS|msg?y+9mRpZmAEFlW
z9sO7`PsEA!n1n5uE4=@92HFf??S;NPrA?TPye^rAi|_;nu^U%lWu*vjMed`%^Vs=D
zFY0=WQG00z>T}1i7Ju0|SS6B2e(7M4&V}EYf~gBkmj+OexDI`I+xh{Y5D!^Mx5tQl
z!h&cDSZa1yTw`{)3bkkIk^Yl5Y~%i4xP)eGUCaICmzec561s3FwqQTZ*kHa2A3BMP
zaSX1)0z8YF;1v$R*o`8*e#yj?XpzmRCvl`s<Yy0&Tj(Oby44i)6ho6~`=o7Vht*_n
z<Az2o#{#O;L}Anuc#Ib?Y8Q)P3u^OK?l#TWj8lle;#l<6bNpC~q>zuO1qb(-<_z!Q
z{P#1_#l#~juG(w9&&-2-I?R`#R{Q|9fKR9=klJA8=i)HpZRp4In29ejfPXL_{fErg
zwFz~-J2(#C9%4sYY2sn?M=P_|A>AowFbAKYF7y}mKj9A>C!+4S(8l}FLEK>Du(cW8
z%%4OpxDzw*bBKZdI{P-7ckIT2#AP@dmtg`nVH&ntJ28p)13FQf%+AxT(=eUs)u=me
zz<7+{VC+CGAoPZTCX6~_nr;wkA{WMDF~;F+)P&VGu0tpBE{w+un2ZtB#9i1MzoBmM
zFY<v&%265~H{$@2{<7T+q!G1{mPmG=n!ITD#!WTe=5S$AuROQc=k(+UJk75Q)8b6z
N4|wt;F;lLW{{vaj`vd?0

diff --git a/po/sv.gmo b/po/sv.gmo
index 2e07679eac6e431f442b43559278bbc5f797b030..5ad15de2854faa175ad5ba805356433130e1f433 100644
GIT binary patch
delta 1739
zcmXxkdrZw?7{Kx8gb<z7Ic^~*A-6-0%C$qclaSb4H^;4MbHqr@<&U4uWfL}r3~Plk
zmrS(UF!PVaKQ<d<uKi^$i_BbxnD66#ZLQDyJn!}QUQSc1>uRg3zAoBnafzJC5lIk{
zop~btunIkR&DxAw|IEf8Z0yQ6?Y!8N`eCT;g4iGDViK;i9zY*)9meDRd~yDDXdw|t
z;<Gg>Br<?F0TVF|b%L3w6Rbd8Xa(v(2T>P%8V6z%X5nMpgWdw_@Fe;$I9+5GE}QO%
z45v^>q9Z=WG<=S!*u79B8PicGT!8vT<){lhgxc;3j=(3jK57QLL7a@*e+Fv%GSmfD
z;%L0+P|$&&TEC)?IDV%2@&Jw?F2cdM1p`=(qwoRx@i&gek$jfs!>Ii#Q73Lh-N}d8
z0Y6%u&$jT*`qTQy8dYREL|bDpiUHi%3*+(M*;|9wd6-Fk1a;x3un#t)9(4<{Fh|-b
zxJks$7U_ZgQP0?q!*LpBU<A2$Qj7e_YySB$z1R%A(z+e>P8>lup2G>)X#I%k#Hn*c
zQkY+sP>3P117mR?>X{wKL3k5&>t3M`f8Z`moGa3;qeu<zW=}88H#;$QG53c00@N>_
zhk7(?@jmTp@QcP_7Rvmxa;eB<tiT}FqYlu9J+R#xyUd(r60RaY1*wwLs5|CbZobru
z`<bW+b)07<d=O{$22+T;mYU1yN5@0M1r$b75m_z53zRC<6~DkS=#H2(3}QBM3FhKi
zOu~1Vg<aN|%NatQXe;VbRpUZzMQxu~CNdOD%GiHxP)Xt@3wes#@#uPyLcET;^&K{t
zqew!1E!n6)Fk#gCZP*)++W0c+v%H6Tgr88Kqo>^TpMpN(MdgkeXe$YwxC*ty4b+vs
zM4hM|hhX20<~2-3c2sgv`-M<<Dq`~|tku?9<f_OS^x}EcS98m;iHFv=w&FMH?e$cc
zhJ#S!2{tak1mduDJ$i_D+V~iHi7#4jqfYn;<MF-KX{VqAyEmCvFaWy|4@13t>Bz}Q
zK6b)F)b_>L8JD6LOEC_&qfW37b)0I9#tWzmtVi9cJ0_nfUu?xMYusk@3{x5=#_r8H
gd^ac5HPfFK@TFx;8h5x??!cJ;QDA(-)ZFiZzfv~j!2kdN

delta 1745
zcmXZcYfQ~y9KiA4iHcIGlaxyx<r;_M5S=Vr9VL~dxvW_(xvMR5n-~0hA<JgV7#kUO
zTr#&xE?YLNd1K~{&BmB(uPh8%!-ntA^K7lp|Mxt<=l(pWqt|u2*VTSC!s&5|oXZzU
z5Rs;NA|tT{-FV0P7`6V5jlbDAqQK;(;4tdFsChvgh08D%w_A^(hqwdd@o9lL{~PpB
z5Jy43HL_4-H1Tj8fmx^nl%o!?0d=B#P&+z?I^kAK!@HP^FYy4T%ohpaS@dAANTd|k
z6*(f4_~@WuAihK&zQqX`zd&RR22clFfx4pIs1rPnns*a3@s+KQEEbtaJRY_EBGmkC
zs1t0)so3W5p&h@r{z4CNQi)mlY|JFCz_GX&{TRY2_zb-m#&V{k54F4+wOupnz+I?2
z`5Xt}cdOHHKYm;PS_dpNiILW5YaE8rfg6)B3ICtHHE6BGS=85|PW&P!<73pL?m;Hz
zNFN`u6eN_148<|1XY9vGSb$krhuk~4fc(iv{&_L5$aK8X+JJf|PGBrv!EEfZe#e=_
zQ_4j$7+==#5k)~G#^7PpGdqpx_yBe5KA;Ex;C@V7ED}9X<UBUAr|nD4PRyzl8A5$2
z>WV8-kER}<kar&YG_GQzj4vBkip;@1I2UiBcF>1I(Y4B$fO?i0xE}M66lq1>v53`X
zr73ubfhth@d9#)Uab~@kK^(imTuwhaZW34UF`0_G&1^Tepw9RmPDA$=bB008Bi@8T
zyo{;%8FMkF#$3)4)PeS)9#sgJ<5$%D1+}~k+*Hf{YeF*xcbUj*)P^Uwl7#nAw|>wz
za}*h<ucZ+62c{ae-ofE`(#AJXpXC$OBm9B-9Fyx!`#kgzSJgYFqkR<Uz%8f^?xW81
zJ?cQN?IPna6`7~ZLv~b(P}`ND?o^#EKVuD9FCbS%E@2{GLwz;fjxBg@{bVb`c9`3n
zjG8#X#<?~w#RST$tvk_8++^cZm`L1aeTdr63yjAvR>!r|4CKZrD$+3;y{MNjfV$#h
z497CmXSD<)aV;id4aQ*u>HvpP`w3wLUPqnaE!3TQWXea#Pg^0oOhO{+Go08Nh&h-Q
n?%i6y-hZ?^zi@Dt*FVGK3*`8Y#s|})Oq8AD3v}iL`~Cj_TYKY%

diff --git a/po/trader.pot b/po/trader.pot
index b296a32..a02a21e 100644
--- a/po/trader.pot
+++ b/po/trader.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trader 7.10-pre2\n"
+"Project-Id-Version: trader 7.10\n"
 "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
-"POT-Creation-Date: 2017-05-23 09:01+1000\n"
+"POT-Creation-Date: 2017-06-02 05:31+1000\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"
@@ -22,18 +22,18 @@ msgstr ""
 #. your own language (recommended) or keep it the same as the English
 #. version.  Feel free to look through other translations to see how
 #. others have done this.
-#: data/trader.desktop.in:22 src/intf.c:610
+#: data/trader.desktop.in:23 src/intf.c:610
 #, c-format
 msgid "Star Traders"
 msgstr ""
 
-#: data/trader.desktop.in:23
+#: data/trader.desktop.in:24
 msgid "Play Star Traders, a simple game of interstellar trading"
 msgstr ""
 
 #. TRANSLATORS: A list of keywords describing Star Traders.  By all means
 #. add your own keywords!
-#: data/trader.desktop.in:26
+#: data/trader.desktop.in:27
 msgid "game;interstellar;trading;strategy;"
 msgstr ""
 
@@ -41,7 +41,7 @@ msgstr ""
 #. Entry Specification states it is translatable, but unless you provide a
 #. matching icon, please leave it as "trader": this will use trader.svg
 #. and the various trader.png files in the data source code directory.
-#: data/trader.desktop.in:31
+#: data/trader.desktop.in:32
 msgid "trader"
 msgstr ""
 
@@ -1218,7 +1218,7 @@ msgstr ""
 #. ~y       - Print the height of the galaxy map (MAX_Y) [**]
 #. ~m       - Print the number of moves available (NUMBER_MOVES) [**]
 #. ~c       - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*]
-#. ~t       - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**]
+#. ~t       - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**]
 #. ~1 to ~9 - Print the keycode for the N-th choice of move [***]
 #. ~M       - Print the keycode for the last choice of move [***]
 #. ~A to ~H - Print the character used to represent the company on the galaxy map [***]
diff --git a/src/Makefile.in b/src/Makefile.in
index 8ec3f2b..64923e2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -129,15 +129,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \
 	$(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \
-	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
 	$(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/iconv_h.m4 $(top_srcdir)/m4/iconv_open.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libunistring-base.m4 \
 	$(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.m4 \
 	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
@@ -147,14 +146,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
 	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
-	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
-	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/sys_socket_h.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
+	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
 	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/time_h.m4 \
 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \