From 01a177a02d27116847a560b36ad638a142b0adaa Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 05:45:16 +1000 Subject: [PATCH 01/25] =?UTF-8?q?Add=20the=20Hungarian=20translation=20by?= =?UTF-8?q?=20Bal=C3=A1zs=20=C3=9Ar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Downloaded from the Translation Project, http://translationproject.org/PO-files/hu/trader-7.6.hu.po --- po/hu.po | 1712 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1712 insertions(+) create mode 100644 po/hu.po diff --git a/po/hu.po b/po/hu.po new file mode 100644 index 0000000..1fae595 --- /dev/null +++ b/po/hu.po @@ -0,0 +1,1712 @@ +# Hungarian translation for trader. +# Copyright (C) 2014 John Zaitseff +# This file is distributed under the same license as the trader package. +# +# Balázs Úr , 2014. +msgid "" +msgstr "" +"Project-Id-Version: trader 7.6\n" +"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" +"POT-Creation-Date: 2014-08-13 12:13+1000\n" +"PO-Revision-Date: 2014-09-24 22:46+0200\n" +"Last-Translator: Balázs Úr \n" +"Language-Team: Hungarian \n" +"Language: hu\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.5\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 célja\n" +"társaságok létrehozása, részvények vásárlása és eladása, pénz kölcsönkérése és\n" +"visszafizetése azért, hogy a leggazdagabb játékossá (győztessé) váljon.\n" +"\n" +"Ez a program szabad szoftver, amely a GNU General Public License 3-as vagy\n" +"későbbi változata szerint terjesztett. Bizonyos feltételek mellett\n" +"terjeszthető, illetve módosítható. Ehhez a program NINCS GARANCIA, a törvény\n" +"által megengedett mértékben; a részletekért tekintse meg a 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 +#.
\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
\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 "Gemeni Inc" +msgstr "Gemeni 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 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 ^{^} to continue a game: " +msgstr "Adja meg a játékosok számát [^{1^}-^{%d^}] vagy ^{^} 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 "Cc" + +#: src/game.c:341 src/move.c:399 +#, c-format +msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " +msgstr "Adja meg a játék számát [^{1^}-^{9^}] vagy ^{^} 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:868 +#, 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 +#. ). 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>^} Részvényportfólió megjelenítése" + +#: src/move.c:245 +#, c-format +msgid "^{<2>^} Declare bankruptcy" +msgstr "^{<2>^} Csőd jelentése" + +#: src/move.c:247 +#, c-format +msgid "^{<3>^} Save and end the game" +msgstr "^{<3>^} Mentés és a játék befejezése" + +#: src/move.c:249 +#, c-format +msgid "^{^} Quit the game" +msgstr "^{^} Kilépés a játékból" + +#. 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^}/^{^}]: " +msgstr "Lépés kiválasztása [^[%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:295 +#, c-format +msgid "Move ^{%lc^}" +msgstr "Lépés ^{%lc^}" + +#: src/move.c:316 +#, c-format +msgid "^{<2>^} (Declare bankruptcy)" +msgstr "^{<2>^} (Csőd jelentése)" + +#: src/move.c:325 +#, c-format +msgid "^{<3>^} (Save and end the game)" +msgstr "^{<3>^} (Mentés és a játék befejezése)" + +#: src/move.c:346 +#, c-format +msgid "^{^} (Quit the game)" +msgstr "^{^} (Kilépés a játékból)" + +#: src/move.c:361 +#, c-format +msgid "Are you sure? [^{Y^}/^{N^}] " +msgstr "Biztos benne? [^{I^}/^{N^}] " + +#: src/move.c:378 src/move.c:456 +#, c-format +msgid "Saving game %d... " +msgstr "%d. játék mentése... " + +#: src/move.c:686 src/move.c:694 src/move.c:1052 src/move.c:1089 +#, c-format +msgid " Bankruptcy Court " +msgstr " Csődbíróság " + +#. 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 "%ls - fizetésképtelenné nyilvánította a Csillagközi Kereskedelmi Bank." + +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:696 +#, c-format +msgid "%ls has declared bankruptcy." +msgstr "%ls fizetésképtelenné lett nyilvánítva." + +#: src/move.c:764 +#, c-format +msgid " New Company " +msgstr " Új társaság " + +#: src/move.c:765 +#, 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:824 +#, 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:830 +#, 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:850 +#, 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:861 +#, 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:875 +#, 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:880 +#, 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:887 +#, 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:893 +#, c-format +msgctxt "subtitle" +msgid "Old" +msgstr "Régi" + +#. 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 "" +"%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: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 "" +"%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:1106 +#, 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:1114 +#, c-format +msgctxt "label" +msgid "Old share value: " +msgstr "Régi részvényérték: " + +#: src/move.c:1197 src/move.c:1232 src/exch.c:321 +#, c-format +msgid " Interstellar Trading Bank " +msgstr " Csillagközi Kereskedelmi Bank " + +#: src/move.c:1199 +#, 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:1234 +#, 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:633 +#, c-format +msgctxt "label|Stock B" +msgid "Percentage owned: " +msgstr "Birtokolt arány: " + +#: src/exch.c:638 +#, 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:651 +#, c-format +msgid "^{<1>^} Buy stock from company" +msgstr "^{<1>^} Részvény vétele a társaságtól" + +#: src/exch.c:653 +#, c-format +msgid "^{<2>^} Sell stock back to company" +msgstr "^{<2>^} Részvény eladása a társaságnak" + +#: src/exch.c:655 +#, c-format +msgid "^{<3>^} Bid company to issue more shares" +msgstr "^{<3>^} További részvények kibocsátása" + +#: src/exch.c:657 +#, c-format +msgid "^{<4>^} Exit to the Stock Exchange" +msgstr "^{<4>^} Kilépés az értéktőzsdére" + +#: src/exch.c:660 +#, c-format +msgid "Enter selection [^{1^}-^{4^}]: " +msgstr "Kijelölés megadása [^{1^}-^{4^}]: " + +#: src/exch.c:716 +#, c-format +msgid " No Shares Available " +msgstr " Nincsenek elérhető részvények " + +#: src/exch.c:717 +#, 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:721 +#, c-format +msgid " Insufficient Cash " +msgstr " Nincs elég készpénz " + +#: src/exch.c:722 +#, 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:733 +#, 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:739 +#, c-format +msgid "How many shares do you wish to purchase? " +msgstr "Hány részvényt szeretne vásárolni? " + +#: src/exch.c:760 +#, c-format +msgid " No Shares " +msgstr " Nincsenek részvények " + +#: src/exch.c:761 +#, c-format +msgid "You do not have any shares to sell." +msgstr "Nincsen egyetlen eladható részvénye sem." + +#: src/exch.c:768 +#, 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:774 +#, c-format +msgid "How many shares do you wish to sell? " +msgstr "Hány részvényt szeretne eladni? " + +#: src/exch.c:802 +#, c-format +msgid " No Shares Issued " +msgstr " Nincsenek kibocsátott részvények " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:804 +#, 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:809 +#, c-format +msgid " Shares Issued " +msgstr " Kibocsátott részvények " + +#. 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 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 "") +#. ^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" +"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" +" ^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\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^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 ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^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^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^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 key?" :-) +#: src/help.c:487 src/intf.c:3035 +#, c-format +msgid "[ Press to continue ] " +msgstr "[ Nyomja le a a folytatáshoz ] " + +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , +#. , , or instead of +#. , and almost any other key instead of +#. (other than , , , , +#. or <\>). +#: src/help.c:494 +#, c-format +msgid "[ Press to continue or for the previous page ] " +msgstr "[ Nyomja le a a folytatáshoz vagy -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:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, 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:637 lib/getopt.c:642 +#, 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:685 lib/getopt.c:704 +#, 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:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: ismeretlen „--%s” kapcsoló\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: ismeretlen „%c%s” kapcsoló\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: érvénytelen kapcsoló -- „%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: a kapcsoló egy argumentumot igényel -- „%c”\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, 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:1013 lib/getopt.c:1031 +#, 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 f7940ad66f6922b3c722cf46de36bc52c7642e6c Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 05:51:48 +1000 Subject: [PATCH 02/25] Start preparing for the next version of Star Traders (version 7.7) --- INSTALL | 8 ++++---- NEWS | 6 ++++++ configure.ac | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index f371be1..835003e 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.6, you could run +the Star Traders source code tree in $HOME/src/trader-7.7, you could run something like: - mkdir $HOME/build/trader-build-7.6 - cd $HOME/build/trader-build-7.6 - $HOME/src/trader-7.6/configure + mkdir $HOME/build/trader-build-7.7 + cd $HOME/build/trader-build-7.7 + $HOME/src/trader-7.7/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/NEWS b/NEWS index 296c9dd..1fe55d4 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.7 (not yet released) +------------------------------ + +No changes yet... + + Version 7.6 (13th August, 2014) ------------------------------- diff --git a/configure.ac b/configure.ac index fe14b94..204f491 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.6], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) +AC_INIT([Star Traders], [7.7], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_PREREQ([2.67]) From c5bfb59f5d000b151a0e03677d924f53b79e6c95 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 05:55:48 +1000 Subject: [PATCH 03/25] =?UTF-8?q?Add=20the=20Hungarian=20translation=20by?= =?UTF-8?q?=20Bal=C3=A1zs=20=C3=9Ar=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 1fe55d4..131558b 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,7 @@ at http://www.zap.org.au/services/svn/. Version 7.7 (not yet released) ------------------------------ -No changes yet... +Added the Hungarian translation, with thanks to Balázs Úr. Version 7.6 (13th August, 2014) diff --git a/po/LINGUAS b/po/LINGUAS index 06c1466..2b8a8ab 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -38,5 +38,6 @@ eo fi fr hr +hu nb ru From 4235e6ee606ebee38c88bee762acb6553dc0f4d6 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 07:35:03 +1000 Subject: [PATCH 04/25] Update version numbers and dates on 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/nb.po | 4 ++-- po/ru.po | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/po/da.po b/po/da.po index 4dbf328..3d598cf 100644 --- a/po/da.po +++ b/po/da.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:50+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 45f9e61..62f27fa 100644 --- a/po/de.po +++ b/po/de.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" diff --git a/po/en_AU.po b/po/en_AU.po index 37537e2..f263e24 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" diff --git a/po/en_CA.po b/po/en_CA.po index 75b1ba3..ca7fc62 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" diff --git a/po/en_GB.po b/po/en_GB.po index 046edcd..bedc7bc 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" diff --git a/po/en_US.po b/po/en_US.po index c1293e5..452f42e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" diff --git a/po/eo.po b/po/eo.po index dd5e52e..4a72fc2 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,9 +13,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" diff --git a/po/fi.po b/po/fi.po index 359af22..ab1bdf7 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,9 +13,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index c1cf03f..c5ae62c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,9 +12,9 @@ # Frédéric Marchal , 2012. msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" diff --git a/po/hr.po b/po/hr.po index 844c8fa..d398618 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" diff --git a/po/nb.po b/po/nb.po index b988746..169f0ac 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/ru.po b/po/ru.po index 9d5c00c..fcb6a18 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,9 +15,9 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" From 93a4e1e6d8c194f31db47038d537cf0301f51371 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 07:46:06 +1000 Subject: [PATCH 05/25] Update the Hungarian translation Change the whitespacing and word-wrapping of the help text, change various other strings and add the standard header comment. --- po/hu.po | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/po/hu.po b/po/hu.po index 1fae595..1d81d8d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,14 +1,21 @@ -# Hungarian translation for trader. -# Copyright (C) 2014 John Zaitseff +# ************************************************************************* +# * * +# * Hungarian Translations for Star Traders * +# * Copyright (C) 2012-14, John Zaitseff * +# * * +# ************************************************************************* +# # This file is distributed under the same license as the trader package. # -# Balázs Úr , 2014. +# Contributors: +# Balázs Úr , 2014. +# msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 12:13+1000\n" -"PO-Revision-Date: 2014-09-24 22:46+0200\n" +"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"PO-Revision-Date: 2014-10-03 07:25+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -59,14 +66,16 @@ 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 célja\n" -"társaságok létrehozása, részvények vásárlása és eladása, pénz kölcsönkérése és\n" -"visszafizetése azért, hogy a leggazdagabb játékossá (győztessé) váljon.\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 vagy\n" -"későbbi változata szerint terjesztett. Bizonyos feltételek mellett\n" -"terjeszthető, illetve módosítható. Ehhez a program NINCS GARANCIA, a törvény\n" -"által megengedett mértékben; a részletekért tekintse meg a licencet.\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 @@ -288,7 +297,7 @@ msgstr "Az első játékos, aki következik: ^{%ls^}." #: src/game.c:259 #, c-format msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " -msgstr "Adja meg a játékosok számát [^{1^}-^{%d^}] vagy ^{^} egy játék folytatásához: " +msgstr "Adja meg a játékosok számát [^{1^}-^{%d^}] vagy ^{^} 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 @@ -298,7 +307,7 @@ msgstr "Adja meg a játékosok számát [^{1^}-^{%d^}] vagy ^{^} egy játék #: src/game.c:276 msgctxt "input|ContinueGame" msgid "Cc" -msgstr "Cc" +msgstr "Ff" #: src/game.c:341 src/move.c:399 #, c-format @@ -847,7 +856,7 @@ msgstr "Kijelölés megadása [^[Társaság betűje^]/^{1^}-^{4^}]: " #, c-format msgctxt "label" msgid "Credit limit: " -msgstr "Hitelkeret: " +msgstr "Hitelkeret: " #. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit #. from the Bank" menu options must all be the same length @@ -1110,8 +1119,7 @@ msgstr[1] "" 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 +#: 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" @@ -1321,6 +1329,7 @@ msgstr "" "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" @@ -1328,7 +1337,6 @@ msgstr "" " ^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" -" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" #: src/help.c:132 msgid "" @@ -1461,10 +1469,9 @@ msgstr "" "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\n" -" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^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 ~. ~. ~. ^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" -" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^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" From a846f48904ec220933c5b9cf816aab258e6dde92 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 08:38:21 +1000 Subject: [PATCH 06/25] Automatically select between left and right justification of the prompt --- NEWS | 3 ++- src/move.c | 47 +++++++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/NEWS b/NEWS index 131558b..0949f55 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,8 @@ at http://www.zap.org.au/services/svn/. Version 7.7 (not yet released) ------------------------------ -Added the Hungarian translation, with thanks to Balázs Úr. +Added the Hungarian translation, with thanks to Balázs Úr. Minor code +changes were made to accommodate this language. Version 7.6 (13th August, 2014) diff --git a/src/move.c b/src/move.c index 7f48264..f1ee76c 100644 --- a/src/move.c +++ b/src/move.c @@ -231,6 +231,9 @@ selection_t get_move (void) // Show menu of choices for the player newtxwin(5, WIN_COLS, 19, WCENTER, false, 0); while (selection == SEL_NONE) { + chtype *promptbuf = xmalloc(BUFSIZE * sizeof(chtype)); + int promptend, promptwidth; + wbkgdset(curwin, attr_normal_window); werase(curwin); box(curwin, 0, 0); @@ -248,19 +251,31 @@ selection_t get_move (void) left(curwin, 3, getmaxx(curwin) / 2, attr_normal, attr_keycode, 0, 1, _("^{^} Quit the game")); - right(curwin, 1, getmaxx(curwin) / 2, attr_normal, attr_keycode, - attr_choice, 1, - /* 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. */ - _("Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: "), - (wint_t) PRINTABLE_GAME_MOVE(0), - (wint_t) PRINTABLE_GAME_MOVE(NUMBER_MOVES - 1)); + mkchstr(promptbuf, BUFSIZE, attr_normal, attr_keycode, attr_choice, + 1, getmaxx(curwin) - 4, &promptwidth, 1, + /* 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. */ + _("Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: "), + (wint_t) PRINTABLE_GAME_MOVE(0), + (wint_t) PRINTABLE_GAME_MOVE(NUMBER_MOVES - 1)); + + if (promptwidth > getmaxx(curwin) / 2 - 2) { + promptend = promptwidth + 2; + leftch(curwin, 1, 2, promptbuf, 1, &promptwidth); + } else { + promptend = getmaxx(curwin) / 2; + rightch(curwin, 1, promptend, promptbuf, 1, &promptwidth); + } curs_set(CURS_ON); wrefresh(curwin); + free(promptbuf); // Get the actual selection made by the player while (selection == SEL_NONE) { @@ -283,8 +298,8 @@ selection_t get_move (void) selection = i; curs_set(CURS_OFF); - left(curwin, 1, getmaxx(curwin) / 2, attr_normal, - attr_choice, 0, 1, + left(curwin, 1, promptend, attr_normal, attr_choice, + 0, 1, /* TRANSLATORS: A game usually consists of DEFAULT_MAX_TURN (50) turns. On each turn, the computer randomly selects @@ -311,7 +326,7 @@ selection_t get_move (void) selection = SEL_BANKRUPT; curs_set(CURS_OFF); - left(curwin, 1, getmaxx(curwin) / 2, attr_normal, + left(curwin, 1, promptend, attr_normal, attr_normal | A_BOLD, 0, 1, _("^{<2>^} (Declare bankruptcy)")); break; @@ -320,7 +335,7 @@ selection_t get_move (void) selection = SEL_SAVE; curs_set(CURS_OFF); - left(curwin, 1, getmaxx(curwin) / 2, attr_normal, + left(curwin, 1, promptend, attr_normal, attr_normal | A_BOLD, 0, 1, _("^{<3>^} (Save and end the game)")); break; @@ -341,7 +356,7 @@ selection_t get_move (void) selection = SEL_QUIT; curs_set(CURS_OFF); - left(curwin, 1, getmaxx(curwin) / 2, attr_normal, + left(curwin, 1, promptend, attr_normal, attr_normal | A_BOLD, 0, 1, _("^{^} (Quit the game)")); break; @@ -357,7 +372,7 @@ selection_t get_move (void) mvwhline(curwin, 3, 2, ' ' | attr_normal, getmaxx(curwin) - 4); // Ask the player to confirm their choice - right(curwin, 2, getmaxx(curwin) / 2, attr_normal, attr_keycode, 0, 1, + right(curwin, 2, promptend, attr_normal, attr_keycode, 0, 1, _("Are you sure? [^{Y^}/^{N^}] ")); wrefresh(curwin); From cbb6f58afb294743b4ab25e2409b7b7c3c02c78a Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 08:41:40 +1000 Subject: [PATCH 07/25] Minor change to the translator comment --- src/move.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/move.c b/src/move.c index f1ee76c..b79b716 100644 --- a/src/move.c +++ b/src/move.c @@ -258,9 +258,8 @@ selection_t get_move (void) 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. */ + either one or two columns, depending on the appropriate + "output|GameMoves" string in the current PO file. */ _("Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: "), (wint_t) PRINTABLE_GAME_MOVE(0), (wint_t) PRINTABLE_GAME_MOVE(NUMBER_MOVES - 1)); From 98c891c4aac90d4f5466477faa68e465e2c5b65b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 08:43:52 +1000 Subject: [PATCH 08/25] Update source line numbers in all PO files --- po/da.po | 74 ++++++++++++++++++++++++++------------------------- po/de.po | 74 ++++++++++++++++++++++++++------------------------- po/en_AU.po | 74 ++++++++++++++++++++++++++------------------------- po/en_CA.po | 74 ++++++++++++++++++++++++++------------------------- po/en_GB.po | 74 ++++++++++++++++++++++++++------------------------- po/en_US.po | 74 ++++++++++++++++++++++++++------------------------- po/eo.po | 74 ++++++++++++++++++++++++++------------------------- po/fi.po | 74 ++++++++++++++++++++++++++------------------------- po/fr.po | 74 ++++++++++++++++++++++++++------------------------- po/hr.po | 74 ++++++++++++++++++++++++++------------------------- po/hu.po | 76 +++++++++++++++++++++++++++-------------------------- po/nb.po | 74 ++++++++++++++++++++++++++------------------------- po/ru.po | 74 ++++++++++++++++++++++++++------------------------- 13 files changed, 495 insertions(+), 469 deletions(-) diff --git a/po/da.po b/po/da.po index 3d598cf..276a477 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:50+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -311,7 +311,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Indtast spilnummer [^{1^}-^{9^}] eller ^{^} for at afbryde: " @@ -388,7 +388,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -544,32 +544,34 @@ msgstr "Rente: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Vis aktieportefølje" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Erklær konkurs" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Gem og afslut spillet" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Afslut spillet" -#. 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^}/^{^}]: " msgstr "Vælg handling [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -581,59 +583,59 @@ msgstr "Vælg handling [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Handling ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Erklær konkurs)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Gem og afslut spillet)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Afslut spillet)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Er du sikker? [^{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 "Gemmer spil %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 " Konkursretten " #. 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 er blevet erklæret konkurs af Den Interstellare Handelsbank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls er blevet erklæret konkurs." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Nyt firma " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -642,7 +644,7 @@ msgstr "" "Et nyt firma er blevet dannet!\n" "Dets navn er ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -651,7 +653,7 @@ msgstr "" "^{%ls^} er blevet fusioneret med ^{%ls^}.\n" "Bemærk venligst de følgende transaktioner:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Firmafusion " @@ -663,7 +665,7 @@ msgstr " Firmafusion " #. 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 +674,7 @@ 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:861 +#: src/move.c:875 #, c-format msgctxt "label" msgid "New Stock: " @@ -683,7 +685,7 @@ msgstr "Ny aktie: " #. 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 +694,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -702,7 +704,7 @@ msgstr "I alt" #. 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" @@ -713,14 +715,14 @@ msgstr "Nye" #. 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 "Gammel" #. 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" @@ -732,7 +734,7 @@ msgstr "" "^{Alle aktiver er blevet beslaglagt som betaling for udestående lån.^}" #. 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" @@ -751,7 +753,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: " @@ -761,18 +763,18 @@ msgstr "Beløb betalt per aktie: " #. 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 "Gammel aktieværdi: " -#: 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 " Den Interstellare Handelsbank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -781,7 +783,7 @@ msgstr "" "Du blev tvunget til at låne %N\n" "for at dække tabene fra dine firmaaktier." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/de.po b/po/de.po index 62f27fa..212f111 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -317,7 +317,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Ww" -#: 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 ^{^} to cancel: " msgstr "" @@ -396,7 +396,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -552,32 +552,34 @@ msgstr "Zinssatz: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Aktienbesitz anzeigen" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Bankrott erklären" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Abspeichern und Spiel beenden" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Beenden des Spiels" -#. 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^}/^{^}]: " msgstr "Spielzug wählen [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -589,59 +591,59 @@ msgstr "Spielzug wählen [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Spielzug ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Bankrott erklären)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Abspeichern und Spiel beenden)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Spiel beenden)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Sind Sie sicher? [^{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 "Spiel %d wird gespeichert... " -#: 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 " Amtsgericht " #. 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 wurde von der Interstellaren Handelsbank für bankrott erklärt." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls hat Bankrott erklärt." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Neue Firma " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -650,7 +652,7 @@ msgstr "" "Eine neue Firma wurde gegründet!\n" "Ihr Name ist ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -659,7 +661,7 @@ msgstr "" "^{%ls^} wurde gerade fusioniert mit ^{%ls^}.\n" "Bitte beachten Sie die folgenden Transaktionen:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Firmenfusionierung " @@ -671,7 +673,7 @@ msgstr " Firmenfusionierung " #. 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: " @@ -679,7 +681,7 @@ msgstr "Alte Aktien: " #. 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: " @@ -690,7 +692,7 @@ msgstr "Neue Aktien: " #. 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)" @@ -699,7 +701,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -709,7 +711,7 @@ msgstr "Gesamt" #. 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" @@ -718,14 +720,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Alt" #. 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" @@ -737,7 +739,7 @@ msgstr "" "^{Aller Besitz wurde für die Rückzahlung ausstehender Kredite verwendet.^}" #. 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" @@ -756,7 +758,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: " @@ -766,18 +768,18 @@ msgstr "Anteil pro Aktie bezahlt: " #. 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 "Alter Wert: " -#: 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 " Interstellare Handelsbank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -786,7 +788,7 @@ msgstr "" "Sie mussten sich %N leihen,\n" "um die Verluste ihrer Firmenanteile zu decken." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_AU.po b/po/en_AU.po index f263e24..99e3286 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -306,7 +306,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -383,7 +383,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -539,32 +539,34 @@ msgstr "Interest rate: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Display stock portfolio" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#. 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^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -576,59 +578,59 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Move ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Saving game %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 " Bankruptcy Court " #. 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 has been declared bankrupt by the Interstellar Trading Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " New Company " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -637,7 +639,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -646,7 +648,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Company Merger " @@ -658,7 +660,7 @@ msgstr " Company Merger " #. 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: " @@ -666,7 +668,7 @@ msgstr "Old stock: " #. 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: " @@ -677,7 +679,7 @@ msgstr "New Stock: " #. 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)" @@ -686,7 +688,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -696,7 +698,7 @@ msgstr "Total" #. 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" @@ -705,14 +707,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Old" #. 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" @@ -724,7 +726,7 @@ msgstr "" "^{All assets have been taken to repay outstanding loans.^}" #. 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" @@ -743,7 +745,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: " @@ -753,18 +755,18 @@ msgstr "Amount paid per share: " #. 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 "Old share value: " -#: 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 " Interstellar Trading Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -773,7 +775,7 @@ msgstr "" "You were forced to borrow %N\n" "to cover losses from company shares." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_CA.po b/po/en_CA.po index ca7fc62..7c2bac6 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -306,7 +306,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -383,7 +383,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -539,32 +539,34 @@ msgstr "Interest rate: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Display stock portfolio" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#. 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^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -576,59 +578,59 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Move ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Saving game %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 " Bankruptcy Court " #. 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 has been declared bankrupt by the Interstellar Trading Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " New Company " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -637,7 +639,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -646,7 +648,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Company Merger " @@ -658,7 +660,7 @@ msgstr " Company Merger " #. 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: " @@ -666,7 +668,7 @@ msgstr "Old stock: " #. 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: " @@ -677,7 +679,7 @@ msgstr "New Stock: " #. 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)" @@ -686,7 +688,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -696,7 +698,7 @@ msgstr "Total" #. 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" @@ -705,14 +707,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Old" #. 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" @@ -724,7 +726,7 @@ msgstr "" "^{All assets have been taken to repay outstanding loans.^}" #. 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" @@ -743,7 +745,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: " @@ -753,18 +755,18 @@ msgstr "Amount paid per share: " #. 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 "Old share value: " -#: 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 " Interstellar Trading Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -773,7 +775,7 @@ msgstr "" "You were forced to borrow %N\n" "to cover losses from company shares." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_GB.po b/po/en_GB.po index bedc7bc..c192c18 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -306,7 +306,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -383,7 +383,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -539,32 +539,34 @@ msgstr "Interest rate: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Display stock portfolio" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#. 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^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -576,59 +578,59 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Move ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Saving game %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 " Bankruptcy Court " #. 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 has been declared bankrupt by the Interstellar Trading Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " New Company " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -637,7 +639,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -646,7 +648,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Company Merger " @@ -658,7 +660,7 @@ msgstr " Company Merger " #. 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: " @@ -666,7 +668,7 @@ msgstr "Old stock: " #. 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: " @@ -677,7 +679,7 @@ msgstr "New Stock: " #. 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)" @@ -686,7 +688,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -696,7 +698,7 @@ msgstr "Total" #. 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" @@ -705,14 +707,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Old" #. 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" @@ -724,7 +726,7 @@ msgstr "" "^{All assets have been taken to repay outstanding loans.^}" #. 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" @@ -743,7 +745,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: " @@ -753,18 +755,18 @@ msgstr "Amount paid per share: " #. 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 "Old share value: " -#: 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 " Interstellar Trading Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -773,7 +775,7 @@ msgstr "" "You were forced to borrow %N\n" "to cover losses from company shares." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_US.po b/po/en_US.po index 452f42e..856f654 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -306,7 +306,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -383,7 +383,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -539,32 +539,34 @@ msgstr "Interest rate: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Display stock portfolio" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#. 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^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -576,59 +578,59 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Move ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Saving game %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 " Bankruptcy Court " #. 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 has been declared bankrupt by the Interstellar Trading Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " New Company " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -637,7 +639,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -646,7 +648,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Company Merger " @@ -658,7 +660,7 @@ msgstr " Company Merger " #. 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: " @@ -666,7 +668,7 @@ msgstr "Old stock: " #. 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: " @@ -677,7 +679,7 @@ msgstr "New Stock: " #. 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)" @@ -686,7 +688,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -696,7 +698,7 @@ msgstr "Total" #. 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" @@ -705,14 +707,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Old" #. 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" @@ -724,7 +726,7 @@ msgstr "" "^{All assets have been taken to repay outstanding loans.^}" #. 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" @@ -743,7 +745,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: " @@ -753,18 +755,18 @@ msgstr "Amount paid per share: " #. 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 "Old share value: " -#: 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 " Interstellar Trading Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -773,7 +775,7 @@ msgstr "" "You were forced to borrow %N\n" "to cover losses from company shares." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/eo.po b/po/eo.po index 4a72fc2..84f9d3d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -312,7 +312,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 ^{^} to cancel: " msgstr "Indiku seanc-numeron [^{1^}-^{9^}] aŭ ^{^} por nuligi: " @@ -389,7 +389,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 +545,34 @@ msgstr "Interezo: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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 "^{^} Quit the game" msgstr "^{^} 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^}/^{^}]: " msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -582,59 +584,59 @@ msgstr "Elektu movon [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "^{^} (Quit the game)" msgstr "^{^} (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 +645,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 +654,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 +666,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 +674,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 +685,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 +694,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 +704,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 +713,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 +732,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 +751,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 +761,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 +781,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" diff --git a/po/fi.po b/po/fi.po index ab1bdf7..6cd4729 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -316,7 +316,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Kirjoita pelin numero [^{1^}-^{9^}] tai ^{^} peruuttamiseksi: " @@ -393,7 +393,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -549,32 +549,34 @@ msgstr "Korkoprosentti: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Näytä osakesalkku" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Julista konkurssi" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Tallenna ja lopeta peli" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Poistu pelistä" -#. 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^}/^{^}]: " msgstr "Valitse siirto [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -586,59 +588,59 @@ msgstr "Valitse siirto [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Siirto ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Julista konkurssi)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Tallenna ja lopeta peli)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Poistu pelistä)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Oletko varma? [^{K^}/^{E^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Tallennetaan peliä %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 " Konkurssioikeus " #. 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 "Tähtienvälinen Kauppapankki on julistanut yrityksen %ls konkurssiin." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls on julistettu konkurssiin." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Uusi yritys " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -647,7 +649,7 @@ msgstr "" "Uusi yritys on muodostettu!\n" "Sen nimi on ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -656,7 +658,7 @@ msgstr "" "^{%ls^} on juuri yhdistetty yritykseen ^{%ls^}.\n" "Huomaa seuraavat rahansiirrot:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Yritysyhdistäjä " @@ -668,7 +670,7 @@ msgstr " Yritysyhdistäjä " #. 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: " @@ -676,7 +678,7 @@ msgstr "Vanha osakekanta: " #. 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: " @@ -687,7 +689,7 @@ msgstr "Uusi osakekanta: " #. 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)" @@ -696,7 +698,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -706,7 +708,7 @@ msgstr "Yhteensä" #. 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" @@ -715,14 +717,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Vanha" #. 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" @@ -734,7 +736,7 @@ msgstr "" "^{Kaikki varat on otettu maksamattomien lainojen maksamiseen.^}" #. 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" @@ -753,7 +755,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: " @@ -763,18 +765,18 @@ msgstr "Maksettu summa per osake: " #. 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 "Vanha osakearvo: " -#: 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 " Tähtienvälinen Kauppapankki " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -783,7 +785,7 @@ msgstr "" "Sinun oli pakko lainata %N\n" "kattaaksesi tappiot yrityksen osakkeista." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/fr.po b/po/fr.po index c5ae62c..f80bfc3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -312,7 +312,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: 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 ^{^} to cancel: " msgstr "Entrez le numéro de jeu [^{1^}-^{9^}] ou ^{^} pour annuler: " @@ -389,7 +389,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -545,32 +545,34 @@ msgstr "Taux d'intérêt: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Afficher portefeuille d'actions" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Déclarer en banqueroute" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Enregistrer et terminer le jeu" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quitter le jeu" -#. 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^}/^{^}]: " msgstr "Mouvement [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -582,59 +584,59 @@ msgstr "Mouvement [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Mouvement ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Déclarer en banqueroute)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Enregistrer et terminer le jeu)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quitter le jeu)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Êtes-vous sûr ? [^{O^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Enregistrement du jeu %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 " Tribunal des faillites " #. 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 a été déclaré en banqueroute par la Banque Interstellaire du Commerce." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls s'est déclaré en banqueroute." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Nouvelle compagnie " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -643,7 +645,7 @@ msgstr "" "Une nouvelle compagnie a été formée !\n" "Son nom est ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -652,7 +654,7 @@ msgstr "" "^{%ls^} vient de fusionner dans ^{%ls^}.\n" "Veuillez noter les transactions suivantes:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Fusion de société " @@ -664,7 +666,7 @@ msgstr " Fusion de société " #. 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 +674,7 @@ msgstr "Anciennes actions: " #. 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 +685,7 @@ msgstr "Nouvelles actions: " #. 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 +694,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -702,7 +704,7 @@ msgstr "Total" #. 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 +713,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Anc." #. 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 +732,7 @@ msgstr "" "^{Tous les avoirs ont été saisis pour rembourser les emprunts en cours.^}" #. 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 +751,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 +761,18 @@ msgstr "Montant payé par action: " #. 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 "Valeur d'action préc.: " -#: 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 " Banque Interstellaire du Commerce " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -779,7 +781,7 @@ msgstr "" "Vous avez été obligé d'emprunter %N\n" "pour couvrir les pertes dans les actions." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/hr.po b/po/hr.po index d398618..d69488d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -310,7 +310,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Nn" -#: 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 ^{^} to cancel: " msgstr "Unesite broj igre [^{1^}-^{9^}] ili ^{^} za otkazivanje: " @@ -388,7 +388,7 @@ 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 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -544,32 +544,34 @@ msgstr "Kamatna stopa: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Prikaži portfelj dionica" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Objavi bankrot" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Spremi i završi igru" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Izađi iz igre" -#. 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^}/^{^}]: " msgstr "Odaberite potez [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -581,59 +583,59 @@ msgstr "Odaberite potez [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Potez ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Objavi bankrot)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Spremi i završi igru)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Izađi iz igre)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Jeste li sigurni? [^{D^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, 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 +#: src/move.c:700 src/move.c:708 src/move.c:1066 src/move.c:1103 #, c-format msgid " Bankruptcy Court " msgstr " Stečajni upravitelj " #. 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 "Međuzvjezdana trgovačka banka je proglasila bankrot igrača %ls." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls je objavio bankrot." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Nova tvrtka " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -642,7 +644,7 @@ msgstr "" "Osnovana je nova tvrtka!\n" "Njezino ime je ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -651,7 +653,7 @@ msgstr "" "Tvrtku ^{%ls^} je upravo preuzela tvrtka ^{%ls^}.\n" "Molim obratite pažnju na sljedeće transakcije:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Udruživanje tvrtki " @@ -663,7 +665,7 @@ msgstr " Udruživanje tvrtki " #. 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: " @@ -671,7 +673,7 @@ msgstr "Stare dionice: " #. 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: " @@ -682,7 +684,7 @@ msgstr "Nove dionice: " #. 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)" @@ -691,7 +693,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -701,7 +703,7 @@ msgstr "Ukupno" #. 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" @@ -710,14 +712,14 @@ 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 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Stare" #. 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" @@ -729,7 +731,7 @@ msgstr "" "^{Sva imovina je oduzeta zbog otplate tekućih pozajmica.^}" #. 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" @@ -748,7 +750,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: " @@ -758,18 +760,18 @@ msgstr "Isplata po dionici: " #. 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 "Stara vrijednost dionice: " -#: 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 " Međuzvjezdana trgovačka banka " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -778,7 +780,7 @@ msgstr "" "Prisiljeni ste posuditi %N\n" "za pokrivanje gubitaka dionica tvrtke." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/hu.po b/po/hu.po index 1d81d8d..f1b5812 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" -"PO-Revision-Date: 2014-10-03 07:25+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"PO-Revision-Date: 2014-10-03 08:20+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -309,7 +309,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Ff" -#: 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 ^{^} to cancel: " msgstr "Adja meg a játék számát [^{1^}-^{9^}] vagy ^{^} a megszakításhoz: " @@ -386,7 +386,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -542,32 +542,34 @@ msgstr "Kamatláb: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Részvényportfólió megjelenítése" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Csőd jelentése" -#: src/move.c:247 +#: 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:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Kilépés a játékból" -#. 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^}/^{^}]: " msgstr "Lépés kiválasztása [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -579,59 +581,59 @@ msgstr "Lépés kiválasztása [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Lépés ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Csőd jelentése)" -#: src/move.c:325 +#: 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:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Kilépés a játékból)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Biztos benne? [^{I^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "%d. játék mentése... " -#: 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 " Csődbíróság " #. 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 - fizetésképtelenné nyilvánította a Csillagközi Kereskedelmi Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls fizetésképtelenné lett nyilvánítva." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Új társaság " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -640,7 +642,7 @@ msgstr "" "Egy új társaság alakult!\n" "A neve: ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -649,7 +651,7 @@ msgstr "" "^{%ls^} épp most egyesült a következővel: ^{%ls^}.\n" "Vegye figyelembe a következő tranzakciókat:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Társaság egyesítő " @@ -661,7 +663,7 @@ msgstr " Társaság egyesítő " #. 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: " @@ -669,7 +671,7 @@ 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:861 +#: src/move.c:875 #, c-format msgctxt "label" msgid "New Stock: " @@ -680,7 +682,7 @@ msgstr "Új részvény: " #. 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)" @@ -689,7 +691,7 @@ 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:880 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -699,7 +701,7 @@ msgstr "Összesen" #. 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" @@ -708,14 +710,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Régi" #. 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" @@ -727,7 +729,7 @@ msgstr "" "^{Minden eszközt lefoglaltak a fennálló hitelek visszafizetésére.^}" #. 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" @@ -747,7 +749,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: " @@ -757,18 +759,18 @@ msgstr "Részvényenkénti kifizetés: " #. 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 "Régi részvényérték: " -#: 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 " Csillagközi Kereskedelmi Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -777,7 +779,7 @@ 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:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/nb.po b/po/nb.po index 169f0ac..bfcda96 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -311,7 +311,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Ff" -#: 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 ^{^} to cancel: " msgstr "Tast inn spill nummer [^{1^}-^{9^}] eller ^{^} for å avbryte: " @@ -388,7 +388,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -544,32 +544,34 @@ msgstr "Rentesats: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Vis aksjeportefølje" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Gå konkurs" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Lagre og avslutt spillet" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Avslutt spillet" -#. 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^}/^{^}]: " msgstr "Velg trekk [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -581,59 +583,59 @@ msgstr "Velg trekk [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Trekk ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Gå konkurs)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Lagre og avslutt spillet)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Avslutt spillet)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Er du sikker? [^{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 "Lagrer spill %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 " Skifteretten " #. 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 er erklært konkurs av Interstellar Handelsbank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls har gått konkurs." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Nytt firma " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -642,7 +644,7 @@ msgstr "" "Et nytt firma er opprettet!\n" "Navnet er ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -651,7 +653,7 @@ msgstr "" "^{%ls^} har nettopp fusjonert med ^{%ls^}.\n" "Vær oppmerksom på følgende transaksjoner:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Fusjon " @@ -663,7 +665,7 @@ msgstr " Fusjon " #. 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: " @@ -671,7 +673,7 @@ msgstr "Gamle aksjer: " #. 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: " @@ -682,7 +684,7 @@ msgstr "Nye aksjer: " #. 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)" @@ -691,7 +693,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -701,7 +703,7 @@ msgstr "Totalt" #. 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" @@ -710,14 +712,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Gammel" #. 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" @@ -729,7 +731,7 @@ msgstr "" "^{Alle eiendeler er overtatt for å betale tilbake utestående lån.^}" #. 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" @@ -748,7 +750,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: " @@ -758,18 +760,18 @@ msgstr "Betalt beløp per aksje: " #. 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 "Gammel aksjeverdi: " -#: 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 " Interstellar Handelsbank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -778,7 +780,7 @@ msgstr "" "Du ble tvunget til å låne %N\n" "til å dekke tap fra selskapets aksjer." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/ru.po b/po/ru.po index fcb6a18..1390538 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 07:29+1000\n" +"POT-Creation-Date: 2014-10-03 08:41+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -317,7 +317,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Пп" -#: 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 ^{^} to cancel: " msgstr "Введите номер игры [^{1^}-^{9^}], или ^{^}, чтобы отменить: " @@ -395,7 +395,7 @@ msgstr " Победитель игры " #. 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" @@ -551,32 +551,34 @@ msgstr "Процентная ставка: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Показать портфель акций" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Объявить о банкротстве" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Сохранить и выйти из игры" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Выйти из игры" -#. 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^}/^{^}]: " msgstr "Введите выбор [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -588,59 +590,59 @@ msgstr "Введите выбор [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Позиция ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Объявить о банкротстве)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Сохранить и выйти из игры)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Выйти из игры)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Вы уверены? [^{Д^}/^{Н^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Сохраняется игра №%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 " Арбитражный суд " #. 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 обанкротился." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls объявляет о своём банкротстве." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " Новая фирма " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -649,14 +651,14 @@ msgstr "" "Сформировано новое торговое предприятие!\n" "Оно называется ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" msgstr "Фирма ^{%ls^} только что была поглощена фирмой ^{%ls^}. Обратите внимание на следующие транзакции:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Слияние компаний " @@ -668,7 +670,7 @@ msgstr " Слияние компаний " #. 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: " @@ -676,7 +678,7 @@ msgstr "Старые акции: " #. 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: " @@ -687,7 +689,7 @@ msgstr "Новые акции: " #. 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)" @@ -696,7 +698,7 @@ 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:880 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -706,7 +708,7 @@ msgstr "Итог" #. 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" @@ -715,14 +717,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Старые" #. 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" @@ -734,7 +736,7 @@ msgstr "" "^{Все активы использованы банком, чтобы погасить долги фирмы.^}" #. 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" @@ -754,7 +756,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: " @@ -764,18 +766,18 @@ msgstr "Выплаченная сумма за акцию: " #. 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 "Старая цена акции: " -#: 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 " Межзвёздный торговый банк " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -784,7 +786,7 @@ msgstr "" "Вам пришлось взять кредит в размере %N\n" "для покрытия убытка на акции компаний." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" From bad1e27f8f1da6a283d38ba169c874632e7e523c Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 09:17:05 +1000 Subject: [PATCH 09/25] Update a translator comment and regenerate the PO files --- po/da.po | 17 +++++++++-------- po/de.po | 17 +++++++++-------- po/en_AU.po | 17 +++++++++-------- po/en_CA.po | 17 +++++++++-------- po/en_GB.po | 17 +++++++++-------- po/en_US.po | 17 +++++++++-------- po/eo.po | 17 +++++++++-------- po/fi.po | 17 +++++++++-------- po/fr.po | 17 +++++++++-------- po/hr.po | 17 +++++++++-------- po/hu.po | 17 +++++++++-------- po/nb.po | 17 +++++++++-------- po/ru.po | 17 +++++++++-------- src/help.c | 13 +++++++------ 14 files changed, 124 insertions(+), 110 deletions(-) diff --git a/po/da.po b/po/da.po index 276a477..6fbc73f 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:50+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1559,13 +1559,14 @@ msgstr "Side %d af %d" msgid "[ Press to continue ] " msgstr "[ Tryk for at fortsætte ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Tryk for at fortsætte eller for den forrige side ] " diff --git a/po/de.po b/po/de.po index 212f111..2ca4434 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -1563,13 +1563,14 @@ msgstr "Seite %d von %d" msgid "[ Press to continue ] " msgstr "[ drücken um fortzufahren ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ für nächste, für vorherige Seite ] " diff --git a/po/en_AU.po b/po/en_AU.po index 99e3286..d51afbd 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -1548,13 +1548,14 @@ msgstr "Page %d of %d" msgid "[ Press to continue ] " msgstr "[ Press to continue ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " diff --git a/po/en_CA.po b/po/en_CA.po index 7c2bac6..8fc5983 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -1548,13 +1548,14 @@ msgstr "Page %d of %d" msgid "[ Press to continue ] " msgstr "[ Press to continue ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " diff --git a/po/en_GB.po b/po/en_GB.po index c192c18..4d21e3a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -1548,13 +1548,14 @@ msgstr "Page %d of %d" msgid "[ Press to continue ] " msgstr "[ Press to continue ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " diff --git a/po/en_US.po b/po/en_US.po index 856f654..78fceb7 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -1548,13 +1548,14 @@ msgstr "Page %d of %d" msgid "[ Press to continue ] " msgstr "[ Press to continue ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " diff --git a/po/eo.po b/po/eo.po index 84f9d3d..777996a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -1554,13 +1554,14 @@ msgstr "Paĝo %d el %d" msgid "[ Press to continue ] " msgstr "[ Premu por daŭrigi ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Premu por daŭrigi aŭ por la antaŭa paĝo ] " diff --git a/po/fi.po b/po/fi.po index 6cd4729..67bd86d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -1558,13 +1558,14 @@ msgstr "Sivu %d / %d" msgid "[ Press to continue ] " msgstr "[ Paina jatkaaksesi ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Paina jatkaaksesi tai <←> siirtyäksesi edelliselle sivulle ] " diff --git a/po/fr.po b/po/fr.po index f80bfc3..35d45f5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -1566,13 +1566,14 @@ msgstr "Page %d sur %d" msgid "[ Press to continue ] " msgstr "[ Appuyez pour continuer ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Appuyez pour continuer ou pour la page précédente ] " diff --git a/po/hr.po b/po/hr.po index d69488d..1b41986 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -1558,13 +1558,14 @@ msgstr "Stranica %d od %d" msgid "[ Press to continue ] " msgstr "[ Pritisnite za nastavak ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Pritisnite za nastavak ili za povratak ] " diff --git a/po/hu.po b/po/hu.po index f1b5812..96393f0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-10-03 08:20+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -1553,13 +1553,14 @@ msgstr "%d / %d oldal" msgid "[ Press to continue ] " msgstr "[ Nyomja le a a folytatáshoz ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Nyomja le a a folytatáshoz vagy -t az előző oldalhoz] " diff --git a/po/nb.po b/po/nb.po index bfcda96..0647e85 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -1553,13 +1553,14 @@ msgstr "Side %d av %d" msgid "[ Press to continue ] " msgstr "[ Trykk for å fortsette ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Trykk for å fortsette eller for forrige side ] " diff --git a/po/ru.po b/po/ru.po index 1390538..b866683 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:41+1000\n" +"POT-Creation-Date: 2014-10-03 08:55+1000\n" "PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -1564,13 +1564,14 @@ msgstr "Страница №%d из %d" msgid "[ Press to continue ] " msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> — вернуться на пред. страницу ] " diff --git a/src/help.c b/src/help.c index d4cf370..86561ed 100644 --- a/src/help.c +++ b/src/help.c @@ -485,12 +485,13 @@ void show_help (void) center(curwin, getmaxy(curwin) - 2, 0, attr_waitforkey, 0, 0, 1, (curpage == 0) ? _("[ Press to continue ] ") : - /* TRANSLATORS: The specific use of and - is not essential: you can use , - , , or instead of - , and almost any other key instead of - (other than , , , , - or <\>). */ + /* TRANSLATORS: The specific use of and + is not essential: you can use , , , + or instead of , and almost + any other key instead of (other than , + , , , or <\>). + Note that the maximum label length is 76 characters, + including the trailing space. */ _("[ Press to continue or " "for the previous page ] ")); wrefresh(curwin); From 59538bf6755b80058c7b03cdb87e6423a7e05837 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 3 Oct 2014 09:51:31 +1000 Subject: [PATCH 10/25] Add instructions for translators --- INSTALL | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/INSTALL b/INSTALL index 835003e..3b82cc2 100644 --- a/INSTALL +++ b/INSTALL @@ -186,3 +186,66 @@ type: where "/path/to/gnulib-tool" is, of course, the directory containing the Gnulib "gnulib-tool" script. You should be ready to run "./configure && make && make install" now. + + +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. + +First, run "./build-aux/bootstrap" if needed (only for unreleased versions +of Star Traders). + +Next, configure and install Star Traders into your home directory: + + ./configure --prefix=$HOME/opt/trader + make + make install + +If you are adding a new translation, add its GNU Gettext language code to +the file po/LINGUAS, then create the template file for that language ("zz" +is used here): + + (cd po; msginit --locale=zz --width=132) + +Now, modify the PO file for your language using your favourite editor or +translation tool. Please note that the generated PO file has extensive +documentation in its translator comments. If anything is unclear, please +feel free to ask the author and maintainer; contact details are available +in the README file. + +To test your PO file, compile and run Star Traders (replace "zz" with your +language code, of course): + + make && make -C po zz.gmo && make install + LANGUAGE=zz $HOME/opt/trader/bin/trader + +The "make -C po zz.gmo" forces the rebuilding of the GMO output file; the +"LANGUAGE=zz" parameter sets the language of the messages to use. + +This process of editing and testing the PO file can be done iteratively, +of course: make a change, recompile, run the program to see the changes, +repeat as needed. + +Once you have finished your translation, please submit the PO file to the +Translation Project. The relevant web page for Star Traders is: + + http://translationproject.org/domain/trader.html + +More information for translators is available at: + + http://translationproject.org/html/translators.html + +To clean up your install directory, simply run: + + rm -fr $HOME/opt/trader + +By the way, as mentioned in the translator comments, 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. From 7dc4b6656280a1476dcfcb553108759a350162e5 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Nov 2014 11:23:24 +1100 Subject: [PATCH 11/25] Mention the newly added instructions for translators --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0949f55..2a07dc8 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,8 @@ Version 7.7 (not yet released) ------------------------------ Added the Hungarian translation, with thanks to Balázs Úr. Minor code -changes were made to accommodate this language. +changes were made to accommodate this language. Also added documentation +in the file INSTALL to translate Star Traders into another language. Version 7.6 (13th August, 2014) From e5f47143802abc4f398943b2b884ba3d8f04646f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Nov 2014 11:29:04 +1100 Subject: [PATCH 12/25] Update the manual page date --- doc/trader.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/trader.6 b/doc/trader.6 index 2580caf..f2f3f3f 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "13th August, 2014" "Unix-like systems" +.TH TRADER 6 "18th November, 2014" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From 38dcb47742ebd675455af1076ccd19a62038fdef Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Nov 2014 11:31:31 +1100 Subject: [PATCH 13/25] Add today's date to the NEWS file --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2a07dc8..bc4037d 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,8 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.7 (not yet released) ------------------------------- +Version 7.7 (18th November, 2014) +--------------------------------- Added the Hungarian translation, with thanks to Balázs Úr. Minor code changes were made to accommodate this language. Also added documentation From f16f78a509918fa8602956fb2e3fcc0fda2416b1 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 07:27:22 +1000 Subject: [PATCH 14/25] Update the copyright date to 2015 --- COPYING | 2 +- INSTALL | 2 +- Makefile.am | 2 +- NEWS | 6 +++--- README | 4 ++-- build-aux/README | 2 +- configure.ac | 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 +++--- 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 | 2 +- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 51 files changed, 74 insertions(+), 74 deletions(-) diff --git a/COPYING b/COPYING index d265617..9cd26a1 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/INSTALL b/INSTALL index 3b82cc2..2fd8c9a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/Makefile.am b/Makefile.am index 8010c9d..f7843a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/NEWS b/NEWS index bc4037d..974e569 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** @@ -15,8 +15,8 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.7 (18th November, 2014) ---------------------------------- +Version 7.7 (19th August, 2015) +------------------------------- Added the Hungarian translation, with thanks to Balázs Úr. Minor code changes were made to accommodate this language. Also added documentation diff --git a/README b/README index 0f59a23..3a5add6 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** @@ -67,7 +67,7 @@ welcomed! Please send these to: Copyright ========= -Copyright (C) 1990-2014, John Zaitseff. +Copyright (C) 1990-2015, 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 d828472..a8744b3 100644 --- a/build-aux/README +++ b/build-aux/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/configure.ac b/configure.ac index 204f491..3554af3 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-2014, John Zaitseff * +dnl * Copyright (C) 1990-2015, John Zaitseff * dnl * * dnl ********************************************************************* dnl diff --git a/doc/Makefile.am b/doc/Makefile.am index b49492a..36cd4a8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/doc/README b/doc/README index 4b63e97..bba1701 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/doc/trader.6 b/doc/trader.6 index f2f3f3f..0d4d536 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -1,7 +1,7 @@ .\" ********************************************************************* .\" * * .\" * Star Traders: A Game of Interstellar Trading * -.\" * Copyright (C) 1990-2014, John Zaitseff * +.\" * Copyright (C) 1990-2015, John Zaitseff * .\" * * .\" ********************************************************************* .\" @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "18th November, 2014" "Unix-like systems" +.TH TRADER 6 "19th August, 2015" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -200,7 +200,7 @@ Australia .PP .\" ********************************************************************* .SH COPYRIGHT -Copyright \(co 1990\-2014, John Zaitseff. +Copyright \(co 1990\-2015, 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 17d07eb..0b1337f 100644 --- a/lib/README +++ b/lib/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/m4/Makefile.am b/m4/Makefile.am index 350b142..1bd0b85 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/m4/README b/m4/README index 4489a04..c059336 100644 --- a/m4/README +++ b/m4/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/po/LINGUAS b/po/LINGUAS index 2b8a8ab..f83959b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/po/Makevars b/po/Makevars index 1e463fd..f9fb658 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/po/POTFILES.in b/po/POTFILES.in index 1a96342..63d5dc5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/po/README b/po/README index 498336c..543b682 100644 --- a/po/README +++ b/po/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/po/da.po b/po/da.po index 6fbc73f..073f8cf 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Danish Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:50+1000\n" +"PO-Revision-Date: 2015-08-18 07:16+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index 2ca4434..2cb907a 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * German Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:51+1000\n" +"PO-Revision-Date: 2015-08-18 07:16+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/en_AU.po b/po/en_AU.po index d51afbd..39a1e3e 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Australian) Translations for Star Traders * -# * Copyright (C) 1990-2014, John Zaitseff * +# * Copyright (C) 1990-2015, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-14. +# John Zaitseff , 2011-15. # msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:51+1000\n" +"PO-Revision-Date: 2015-08-18 07:16+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 8fc5983..b2cdf16 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Canadian) Translations for Star Traders * -# * Copyright (C) 1990-2014, John Zaitseff * +# * Copyright (C) 1990-2015, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-14. +# John Zaitseff , 2011-15. # msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:51+1000\n" +"PO-Revision-Date: 2015-08-18 07:16+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 4d21e3a..a9bf8ea 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (British) Translations for Star Traders * -# * Copyright (C) 1990-2014, John Zaitseff * +# * Copyright (C) 1990-2015, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-14. +# John Zaitseff , 2011-15. # msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 78fceb7..ba6769f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (US) Translations for Star Traders * -# * Copyright (C) 1990-2014, John Zaitseff * +# * Copyright (C) 1990-2015, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011-14. +# John Zaitseff , 2011-15. # msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 777996a..6410a97 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Esperanto Translations for Star Traders * -# * Copyright (C) 2013-14, John Zaitseff * +# * Copyright (C) 2013-15, John Zaitseff * # * Copyright (C) 2013, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index 67bd86d..0b90b5f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Finnish Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * Copyright (C) 2012, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index 35d45f5..f15ad74 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * French Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * Copyright (C) 2012-13, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/hr.po b/po/hr.po index 1b41986..cf93744 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Croatian Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:17+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/hu.po b/po/hu.po index 96393f0..fa9b063 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-15, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-10-03 08:20+1000\n" +"PO-Revision-Date: 2015-08-18 07:18+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" diff --git a/po/nb.po b/po/nb.po index 0647e85..37cc80e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Norwegian Bokmål Translations for Star Traders * -# * Copyright (C) 2012-14, John Zaitseff * +# * Copyright (C) 2012-15, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:18+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/ru.po b/po/ru.po index b866683..f6934df 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,14 +2,14 @@ # * * # * Russian Translations for Star Traders * # * Русский перевод для игры «Звёздные торговцы» * -# * Copyright (C) 1990-2014, John Zaitseff * +# * Copyright (C) 1990-2015, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-14. +# John Zaitseff , 2011-15. # Vladimir B. Tsarkov , 2012. # Pavel Maryanov , 2012. # @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2014-08-13 11:52+1000\n" +"PO-Revision-Date: 2015-08-18 07:18+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/src/Makefile.am b/src/Makefile.am index 238f06a..72ec725 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### diff --git a/src/README b/src/README index 599f2bf..30f4fe3 100644 --- a/src/README +++ b/src/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************** diff --git a/src/exch.c b/src/exch.c index 4cc55d9..f1bbc9f 100644 --- a/src/exch.c +++ b/src/exch.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/exch.h b/src/exch.h index 0035df5..3d5b3ec 100644 --- a/src/exch.h +++ b/src/exch.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.c b/src/fileio.c index d636b3b..aaca368 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.h b/src/fileio.h index 5937b5e..3bf2268 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.c b/src/game.c index 47c4f44..ac9c50b 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.h b/src/game.h index f69f1b1..ba9f812 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.c b/src/globals.c index b447cdf..8b0fbd9 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.h b/src/globals.h index e84c5d5..20b54e0 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.c b/src/help.c index 86561ed..636dc8d 100644 --- a/src/help.c +++ b/src/help.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.h b/src/help.h index bda7ad9..987748c 100644 --- a/src/help.h +++ b/src/help.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.c b/src/intf.c index 83eb644..73bb198 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.h b/src/intf.h index 3571634..f25ce95 100644 --- a/src/intf.h +++ b/src/intf.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.c b/src/move.c index b79b716..3cbb5b0 100644 --- a/src/move.c +++ b/src/move.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.h b/src/move.h index 0026c46..e08185f 100644 --- a/src/move.h +++ b/src/move.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/system.h b/src/system.h index a936cc4..335575e 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.c b/src/trader.c index 71c55ce..a0959dc 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.h b/src/trader.h index 32f8385..f4161e2 100644 --- a/src/trader.h +++ b/src/trader.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.c b/src/utils.c index d4681be..4e5bb03 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.h b/src/utils.h index 2029969..0783231 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2014, John Zaitseff * +* Copyright (C) 1990-2015, John Zaitseff * * * ************************************************************************/ From 25d233c7fb8aff7b8907dfeb8a17f79801647408 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 07:47:58 +1000 Subject: [PATCH 15/25] Update to GNU Gettext 0.19.5 --- po/Makefile.in.in | 59 +++++++++++++++++++++++++++++++---------------- po/Rules-quot | 13 ++++++++++- 2 files changed, 51 insertions(+), 21 deletions(-) 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 # -# 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) diff --git a/po/Rules-quot b/po/Rules-quot index 5931e53..9dc9630 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -20,7 +21,17 @@ en@boldquot.po-update: en@boldquot.po-update-en ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ From 79ac3636aee43d567098ef8dd6e7cd981d8b284f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 07:56:30 +1000 Subject: [PATCH 16/25] Update ax_append_flag.m4 to the latest version --- m4/ax_append_flag.m4 | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 index 1d38b76..08f2e07 100644 --- a/m4/ax_append_flag.m4 +++ b/m4/ax_append_flag.m4 @@ -49,21 +49,23 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 2 +#serial 6 AC_DEFUN([AX_APPEND_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl -AS_VAR_SET_IF(FLAGS, - [case " AS_VAR_GET(FLAGS) " in - *" $1 "*) - AC_RUN_LOG([: FLAGS already contains $1]) - ;; - *) - AC_RUN_LOG([: FLAGS="$FLAGS $1"]) - AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) - ;; - esac], - [AS_VAR_SET(FLAGS,["$1"])]) +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS,[" $1"]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) AS_VAR_POPDEF([FLAGS])dnl ])dnl AX_APPEND_FLAG From 9666c85cbc94224e495918318d97fa2ecfe2208c Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 07:57:51 +1000 Subject: [PATCH 17/25] Update to the latest version of the GNU Portability Library --- m4/gnulib-cache.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 1329544..2815afa 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 5e72747140df5f2a88ea835f0918913fc048bc79 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 08:01:59 +1000 Subject: [PATCH 18/25] Update the list of (auto-generated) files to ignore --- lib/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/.gitignore b/lib/.gitignore index 1dfe1fc..a23c7e3 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -38,6 +38,7 @@ memchr.valgrind ref-add.sin ref-del.sin stdbool.in.h +stddef.h stddef.in.h stdint.in.h stdio.in.h From b6ed9600bb260025083510509b9caa4c122c6983 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 08:13:55 +1000 Subject: [PATCH 19/25] Update all PO files for the latest version of Gnulib: one string added --- po/da.po | 31 ++++++++++++++++++------------- po/de.po | 31 ++++++++++++++++++------------- po/en_AU.po | 31 ++++++++++++++++++------------- po/en_CA.po | 31 ++++++++++++++++++------------- po/en_GB.po | 31 ++++++++++++++++++------------- po/en_US.po | 31 ++++++++++++++++++------------- po/eo.po | 31 ++++++++++++++++++------------- po/fi.po | 31 ++++++++++++++++++------------- po/fr.po | 31 ++++++++++++++++++------------- po/hr.po | 31 ++++++++++++++++++------------- po/hu.po | 31 ++++++++++++++++++------------- po/nb.po | 31 ++++++++++++++++++------------- po/ru.po | 33 +++++++++++++++++++-------------- 13 files changed, 235 insertions(+), 170 deletions(-) diff --git a/po/da.po b/po/da.po index 073f8cf..baff317 100644 --- a/po/da.po +++ b/po/da.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:16+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:05+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -1672,57 +1672,62 @@ msgstr "xwcrtomb: NUL" 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: tilvalg »%s« er tvetydigt; muligheder:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: tilvalg »%c%s« tillader ikke et argument\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: tilvalg »--%s« kræver et argument\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: tilvalg blev ikke genkendt »--%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: tilvalg blev ikke genkendt »%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: ugyldigt tilvalg -- »%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: tilvalg kræver et argument -- »%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: tilvalg »W %s« er tvetydigt\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: tilvalg »-W %s« tillader ikke et argument\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: tilvalg »-W %s« kræver et argument\n" diff --git a/po/de.po b/po/de.po index 2cb907a..d8c5885 100644 --- a/po/de.po +++ b/po/de.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:16+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:06+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" @@ -1676,57 +1676,62 @@ msgstr "xwcrtomb: NUL" 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: Option „%s“ ist mehrdeutig; möglich wären:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: Option „%c%s“ akzeptiert keine Argumente\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: Option „--%s“ erfordert ein Argumente\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: unbekannte Option „--%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: unbekannte Option „%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: ungültige Option -- „%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: die Option erfordert ein Argument -- „%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: Option „-W %s“ ist mehrdeutig\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: Option „-W %s“ akzeptiert keine Argumente\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: Option „-W %s“ erfordert ein Argument\n" diff --git a/po/en_AU.po b/po/en_AU.po index 39a1e3e..42e6197 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:16+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:06+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" @@ -1661,57 +1661,62 @@ msgstr "xwcrtomb: NUL" 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: option ‘%s’ is ambiguous; possibilities:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option ‘%c%s’ doesn’t allow an argument\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: option ‘--%s’ requires an argument\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: unrecognised option ‘--%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: unrecognised option ‘%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: invalid option -- ‘%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: option requires an argument -- ‘%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: option ‘-W %s’ is ambiguous\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: option ‘-W %s’ doesn’t allow an argument\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: option ‘-W %s’ requires an argument\n" diff --git a/po/en_CA.po b/po/en_CA.po index b2cdf16..d9f3253 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:16+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:07+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" @@ -1661,57 +1661,62 @@ msgstr "xwcrtomb: NUL" 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: option ‘%s’ is ambiguous; possibilities:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option ‘%c%s’ doesn’t allow an argument\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: option ‘--%s’ requires an argument\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: unrecognized option ‘--%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: unrecognized option ‘%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: invalid option -- ‘%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: option requires an argument -- ‘%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: option ‘-W %s’ is ambiguous\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: option ‘-W %s’ doesn’t allow an argument\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: option ‘-W %s’ requires an argument\n" diff --git a/po/en_GB.po b/po/en_GB.po index a9bf8ea..f2c3d89 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:07+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" @@ -1661,57 +1661,62 @@ msgstr "xwcrtomb: NUL" 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: option ‘%s’ is ambiguous; possibilities:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option ‘%c%s’ doesn’t allow an argument\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: option ‘--%s’ requires an argument\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: unrecognised option ‘--%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: unrecognised option ‘%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: invalid option -- ‘%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: option requires an argument -- ‘%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: option ‘-W %s’ is ambiguous\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: option ‘-W %s’ doesn’t allow an argument\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: option ‘-W %s’ requires an argument\n" diff --git a/po/en_US.po b/po/en_US.po index ba6769f..ca3f383 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:07+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" @@ -1661,57 +1661,62 @@ msgstr "xwcrtomb: NUL" 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: option ‘%s’ is ambiguous; possibilities:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option ‘%c%s’ doesn’t allow an argument\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: option ‘--%s’ requires an argument\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: unrecognized option ‘--%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: unrecognized option ‘%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: invalid option -- ‘%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: option requires an argument -- ‘%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: option ‘-W %s’ is ambiguous\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: option ‘-W %s’ doesn’t allow an argument\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: option ‘-W %s’ requires an argument\n" diff --git a/po/eo.po b/po/eo.po index 6410a97..c432ce1 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:07+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -1667,57 +1667,62 @@ msgstr "xwcrtomb: NUL" 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" diff --git a/po/fi.po b/po/fi.po index 0b90b5f..ab7efe1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:08+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -1671,57 +1671,62 @@ msgstr "xwcrtomb: NUL" 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: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: valitsin ’%c%s’ ei salli argumenttia\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: valitsin ’--%s’ vaatii argumentin\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: tunnistamaton valitsin ’--%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: tunnistamaton valitsin ’%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: virheellinen valitsin -- ’%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: valitsin vaatii argumentin -- ’%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: valitsin ’-W %s’ ei ole yksiselitteinen\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: valitsin ’-W %s’ ei salli argumenttia\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: valitsin ’-W %s’ vaatii argumentin\n" diff --git a/po/fr.po b/po/fr.po index f15ad74..5bdf2fc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:08+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" @@ -1679,57 +1679,62 @@ msgstr "xwcrtomb: NUL" 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: option « %s » est ambiguë; les possibilités sont:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option « %c%s » n'accepte pas d'argument\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: option « --%s » exige un argument\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: option « --%s » non reconnue\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: option « %c%s » non reconnue\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: option invalide -- « %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: option exige un argument -- « %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: option « -W %s » est ambiguë\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: option « -W %s » n'accepte pas d'argument\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: option « -W %s » exige un argument\n" diff --git a/po/hr.po b/po/hr.po index cf93744..71c82a2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:17+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:09+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -1671,57 +1671,62 @@ msgstr "xwcrtomb: NUL" 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: opcija „%s” je višeznačna; mogućnosti:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opcija „%s” je višeznačna\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, 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 +#: lib/getopt.c:667 lib/getopt.c:672 #, 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 +#: lib/getopt.c:715 lib/getopt.c:734 #, 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 +#: 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:753 lib/getopt.c:756 +#: 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:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, 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 +#: 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: opcija zahtijeva argument -- „%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: opcija „-W %s” je višeznačna\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: opcija „-W %s” ne dozvoljava argument\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: opcija „-W %s” zahtijeva argument\n" diff --git a/po/hu.po b/po/hu.po index fa9b063..dc9a3aa 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:18+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:09+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -1666,57 +1666,62 @@ msgstr "xwcrtomb: NUL" 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: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: a „%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: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: a(z) „%c%s” kapcsoló nem enged meg argumentumot\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: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\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: ismeretlen „--%s” kapcsoló\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: ismeretlen „%c%s” kapcsoló\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: érvénytelen kapcsoló -- „%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: a kapcsoló egy argumentumot igényel -- „%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: a „-W %s” kapcsoló nem egyértelmű\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: a „-W %s” kapcsoló nem enged meg argumentumot\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: a „-W %s” kapcsolóhoz egy argumentum szükséges\n" diff --git a/po/nb.po b/po/nb.po index 37cc80e..c397b4c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:18+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:09+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -1666,57 +1666,62 @@ msgstr "xwcrtomb: NUL" 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: valget «%s» er flertydig; muligheter:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: valget «%c%s» tillater ikke argumenter\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: valget «--%s» krever et argument\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: ukjent valg «--%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: ukjent valg «%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: ugyldig valg -- «%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: valget krever et argument -- «%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: valget «-W %s» er flertydig\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: valget «-W %s» tillater ikke argumenter\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: valget «-W %s» krever et argument\n" diff --git a/po/ru.po b/po/ru.po index f6934df..1e25be6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-10-03 08:55+1000\n" -"PO-Revision-Date: 2015-08-18 07:18+1000\n" +"POT-Creation-Date: 2015-08-18 07:58+1000\n" +"PO-Revision-Date: 2015-08-18 08:10+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -1677,57 +1677,62 @@ msgstr "xwcrtomb: NUL" 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: неоднозначный ключ «--%s»; возможности:" +msgstr "%s: неоднозначный ключ «%s»; возможности:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: ключ «%c%s» должен использоваться без аргумента\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: ключ «--%s» должен использоваться с аргументом\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: неизвестный ключ «--%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: неизвестный ключ «%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: неверный ключ «%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: ключ «%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: неоднозначный ключ «-W %s»\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: ключ «-W %s» должен использоваться без аргумента\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: ключ «-W %s» должен использоваться с аргументом\n" From bd11c1cd9d9d201e5d6996ff1f0534889c93f494 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 08:19:56 +1000 Subject: [PATCH 20/25] Update the copyright date to 2015 --- src/trader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trader.c b/src/trader.c index a0959dc..076acec 100644 --- a/src/trader.c +++ b/src/trader.c @@ -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-2014"); +"), program_name, PACKAGE_VERSION, "1990-2015"); exit(EXIT_SUCCESS); } From 7549827f95f5e5b966ba0a1b48c97cf4c11b0e2f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 09:10:05 +1000 Subject: [PATCH 21/25] Change the release date to today (18th August, 2015) --- NEWS | 2 +- doc/trader.6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 974e569..598d667 100644 --- a/NEWS +++ b/NEWS @@ -15,7 +15,7 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.7 (19th August, 2015) +Version 7.7 (18th August, 2015) ------------------------------- Added the Hungarian translation, with thanks to Balázs Úr. Minor code diff --git a/doc/trader.6 b/doc/trader.6 index 0d4d536..d4a877d 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "19th August, 2015" "Unix-like systems" +.TH TRADER 6 "18th August, 2015" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From 1efd3fe8ab6a3a78d634dd783b0b2dca7a4c5af5 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 09:32:59 +1000 Subject: [PATCH 22/25] Update the $Id$ fields from an exported copy of the master branch --- Makefile.am | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/trader.6 | 2 +- m4/Makefile.am | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- src/Makefile.am | 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 | 2 +- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 62fae38..7469f09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, Makefile.am, contains the top-level Makefile for Star # Traders. It needs to be processed by automake to produce the diff --git a/configure.ac b/configure.ac index 2138888..7b6fe24 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl * * dnl ********************************************************************* dnl dnl Author: John Zaitseff -dnl $Id: configure.ac 545 2014-06-18 10:55:15Z john $ +dnl $Id: configure.ac 588 2015-08-17 21:27:22Z john $ dnl dnl This file, configure.ac, contains information required by autoconf to dnl generate the corresponding configure script. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8abe03d..329f2b4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, doc/Makefile.am, contains the documentation directory # Makefile for Star Traders. It needs to be processed by automake to diff --git a/doc/trader.6 b/doc/trader.6 index bdb5c45..3991145 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -6,7 +6,7 @@ .\" ********************************************************************* .\" .\" Author: John Zaitseff -.\" $Id: trader.6 554 2014-08-13 01:55:30Z john $ +.\" $Id: trader.6 595 2015-08-17 23:10:05Z john $ .\" .\" 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/m4/Makefile.am b/m4/Makefile.am index c4723e4..8094427 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 524 2014-05-23 21:31:22Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, m4/Makefile.am, contains the m4 macro directory Makefile for # Star Traders. It needs to be processed by automake to produce the diff --git a/po/LINGUAS b/po/LINGUAS index 8fbb5a3..c0f4dc9 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: LINGUAS 514 2014-05-22 01:05:51Z john $ +# $Id: LINGUAS 588 2015-08-17 21:27:22Z john $ # # This file, po/LINGUAS, contains a list of the available languages in # the po directory. diff --git a/po/Makevars b/po/Makevars index 8db4e59..4bb2d40 100644 --- a/po/Makevars +++ b/po/Makevars @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makevars 518 2014-05-22 01:45:57Z john $ +# $Id: Makevars 588 2015-08-17 21:27:22Z john $ # # This file, po/Makevars, contains variables that are substituted into # po/Makefile for use with GNU gettext. diff --git a/po/POTFILES.in b/po/POTFILES.in index 2adb8e2..64a5ba2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: POTFILES.in 514 2014-05-22 01:05:51Z john $ +# $Id: POTFILES.in 588 2015-08-17 21:27:22Z john $ # # This file, po/POTFILES.in, contains a list of source files which # contain translatable strings. diff --git a/src/Makefile.am b/src/Makefile.am index b9775ab..5c10b03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 546 2014-06-18 10:56:09Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, src/Makefile.am, contains the source-code Makefile for Star # Traders. It needs to be processed by automake to produce the diff --git a/src/exch.c b/src/exch.c index 0069942..ae3d543 100644 --- a/src/exch.c +++ b/src/exch.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: exch.c 514 2014-05-22 01:05:51Z john $ + $Id: exch.c 588 2015-08-17 21:27:22Z john $ This file, exch.c, contains the implementation of functions dealing with the Interstellar Stock Exchange and Trading Bank as used in Star diff --git a/src/exch.h b/src/exch.h index 849887a..122574b 100644 --- a/src/exch.h +++ b/src/exch.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: exch.h 514 2014-05-22 01:05:51Z john $ + $Id: exch.h 588 2015-08-17 21:27:22Z john $ This file, exch.h, contains declarations for functions dealing with the Interstellar Stock Exchange and Trading Bank as used in Star Traders. diff --git a/src/fileio.c b/src/fileio.c index 333afdf..fcc1633 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: fileio.c 521 2014-05-23 08:56:24Z john $ + $Id: fileio.c 588 2015-08-17 21:27:22Z john $ This file, fileio.c, contains the implementation of the game load and save functions used in Star Traders. diff --git a/src/fileio.h b/src/fileio.h index b107efe..4b1b235 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: fileio.h 514 2014-05-22 01:05:51Z john $ + $Id: fileio.h 588 2015-08-17 21:27:22Z john $ This file, fileio.h, contains declarations for the load and save game functions used in Star Traders. diff --git a/src/game.c b/src/game.c index c2437c8..4bfa97d 100644 --- a/src/game.c +++ b/src/game.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: game.c 514 2014-05-22 01:05:51Z john $ + $Id: game.c 588 2015-08-17 21:27:22Z john $ This file, game.c, contains the implementation of the starting and ending game functions used in Star Traders, as well as the functions diff --git a/src/game.h b/src/game.h index 551ec63..d28bae9 100644 --- a/src/game.h +++ b/src/game.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: game.h 514 2014-05-22 01:05:51Z john $ + $Id: game.h 588 2015-08-17 21:27:22Z john $ This file, game.h, contains declarations for the starting and ending game functions used in Star Traders. It also contains prototypes of diff --git a/src/globals.c b/src/globals.c index 071fe44..42af901 100644 --- a/src/globals.c +++ b/src/globals.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: globals.c 514 2014-05-22 01:05:51Z john $ + $Id: globals.c 588 2015-08-17 21:27:22Z john $ This file, globals.c, contains the actual global variables and structures used in Star Traders. diff --git a/src/globals.h b/src/globals.h index ccaf446..345bfdc 100644 --- a/src/globals.h +++ b/src/globals.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: globals.h 551 2014-08-13 01:32:27Z john $ + $Id: globals.h 588 2015-08-17 21:27:22Z john $ This file, globals.h, contains declarations for global variables and structures used in Star Traders. diff --git a/src/help.c b/src/help.c index 371fe31..29f45be 100644 --- a/src/help.c +++ b/src/help.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: help.c 514 2014-05-22 01:05:51Z john $ + $Id: help.c 588 2015-08-17 21:27:22Z john $ This file, help.c, contains the actual implementation of help functions as used in Star Traders. diff --git a/src/help.h b/src/help.h index 430d3ca..d9db12d 100644 --- a/src/help.h +++ b/src/help.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: help.h 514 2014-05-22 01:05:51Z john $ + $Id: help.h 588 2015-08-17 21:27:22Z john $ This file, help.h, contains declarations for help functions as used in Star Traders. diff --git a/src/intf.c b/src/intf.c index 4c0aeef..b24a0ca 100644 --- a/src/intf.c +++ b/src/intf.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: intf.c 514 2014-05-22 01:05:51Z john $ + $Id: intf.c 588 2015-08-17 21:27:22Z john $ This file, intf.c, contains the actual implementation of basic text input/output routines as used in Star Traders. diff --git a/src/intf.h b/src/intf.h index f21d772..3faaabf 100644 --- a/src/intf.h +++ b/src/intf.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: intf.h 514 2014-05-22 01:05:51Z john $ + $Id: intf.h 588 2015-08-17 21:27:22Z john $ This file, intf.h, contains declarations for basic text input/output functions used in Star Traders. It uses the X/Open Curses library to diff --git a/src/move.c b/src/move.c index 4944cf3..13dec84 100644 --- a/src/move.c +++ b/src/move.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: move.c 514 2014-05-22 01:05:51Z john $ + $Id: move.c 588 2015-08-17 21:27:22Z john $ This file, move.c, contains the implementation of functions that make and process a game move in Star Traders. diff --git a/src/move.h b/src/move.h index 98f0512..92b1003 100644 --- a/src/move.h +++ b/src/move.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: move.h 514 2014-05-22 01:05:51Z john $ + $Id: move.h 588 2015-08-17 21:27:22Z john $ This file, move.h, contains declarations for functions that make and process a game move in Star Traders. diff --git a/src/system.h b/src/system.h index ca9909b..53e1790 100644 --- a/src/system.h +++ b/src/system.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: system.h 520 2014-05-22 08:17:02Z john $ + $Id: system.h 588 2015-08-17 21:27:22Z john $ This file, system.h, contains system-specific definitions and #include directives for Star Traders. diff --git a/src/trader.c b/src/trader.c index 65a7988..7dc3fac 100644 --- a/src/trader.c +++ b/src/trader.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: trader.c 514 2014-05-22 01:05:51Z john $ + $Id: trader.c 594 2015-08-17 22:19:56Z john $ Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and diff --git a/src/trader.h b/src/trader.h index 7a143af..5ed9d13 100644 --- a/src/trader.h +++ b/src/trader.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: trader.h 521 2014-05-23 08:56:24Z john $ + $Id: trader.h 588 2015-08-17 21:27:22Z john $ This file, trader.h, contains overall definitions for Star Traders. This allows source files to include just one file: this one. diff --git a/src/utils.c b/src/utils.c index eded999..dd2bf59 100644 --- a/src/utils.c +++ b/src/utils.c @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: utils.c 521 2014-05-23 08:56:24Z john $ + $Id: utils.c 588 2015-08-17 21:27:22Z john $ This file, utils.c, contains the implementation of various utility functions used in Star Traders. diff --git a/src/utils.h b/src/utils.h index 0ce0ac4..f520a64 100644 --- a/src/utils.h +++ b/src/utils.h @@ -7,7 +7,7 @@ /* Author: John Zaitseff - $Id: utils.h 521 2014-05-23 08:56:24Z john $ + $Id: utils.h 588 2015-08-17 21:27:22Z john $ This file, utils.h, contains declarations for various utility functions used in Star Traders. From 87a840cdd431cbf0e1f80b476eebac3766409df0 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 09:43:46 +1000 Subject: [PATCH 23/25] Update all auto-generated files These files have been created by running ./build-aux/bootstrap with Gnulib as at commit 5bb169c3be1f80fb22ee63d51b43dfdb1ac22d2a (with a date stamp of Mon Aug 3 12:34:38 2015 -0700), Autoconf 2.69, Automake 1.15 and Gettext 0.19.5. --- Makefile.in | 71 +++--- aclocal.m4 | 65 +++--- build-aux/config.rpath | 2 +- build-aux/snippet/arg-nonnull.h | 2 +- build-aux/snippet/c++defs.h | 2 +- build-aux/snippet/unused-parameter.h | 2 +- build-aux/snippet/warn-on-use.h | 2 +- config.h.in | 20 +- configure | 316 +++++++++++++++++++-------- doc/Makefile.in | 35 ++- lib/Makefile.am | 10 +- lib/Makefile.in | 43 +++- lib/btowc.c | 2 +- lib/c-ctype.c | 2 +- lib/c-ctype.h | 2 +- lib/c-strcase.h | 2 +- lib/c-strcasecmp.c | 2 +- lib/c-strncasecmp.c | 2 +- lib/config.charset | 6 +- lib/crc.c | 2 +- lib/crc.h | 2 +- lib/getopt.c | 54 ++++- lib/getopt.in.h | 2 +- lib/getopt1.c | 2 +- lib/getopt_int.h | 2 +- lib/gettext.h | 2 +- lib/gettimeofday.c | 2 +- lib/iconv.c | 2 +- lib/iconv.in.h | 2 +- lib/iconv_close.c | 2 +- lib/iconv_open.c | 2 +- lib/localcharset.c | 44 +++- lib/localcharset.h | 2 +- lib/locale.in.h | 2 +- lib/mbrtowc.c | 2 +- lib/mbsinit.c | 2 +- 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 | 54 +++-- lib/stdint.in.h | 2 +- lib/stdio.in.h | 12 +- lib/stdlib.in.h | 25 ++- lib/str-two-way.h | 2 +- lib/streq.h | 2 +- lib/striconv.c | 2 +- lib/striconv.h | 2 +- lib/string.in.h | 23 +- lib/strnlen1.c | 2 +- lib/strnlen1.h | 2 +- lib/strstr.c | 2 +- lib/sys_stat.in.h | 2 +- lib/sys_time.in.h | 2 +- lib/sys_types.in.h | 2 +- lib/time.in.h | 31 ++- lib/unistd.in.h | 39 +++- lib/unistr.in.h | 2 +- lib/unistr/u8-mbtoucr.c | 2 +- lib/unistr/u8-uctomb-aux.c | 2 +- lib/unistr/u8-uctomb.c | 2 +- lib/unitypes.in.h | 2 +- lib/verify.h | 2 +- lib/wchar.in.h | 11 +- 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 | 2 +- lib/wmemcpy-impl.h | 2 +- lib/wmemcpy.c | 2 +- m4/00gnulib.m4 | 2 +- m4/Makefile.in | 34 ++- m4/absolute-header.m4 | 2 +- m4/assert.m4 | 2 +- m4/btowc.m4 | 2 +- m4/config-h.m4 | 2 +- m4/configmake.m4 | 2 +- m4/extensions.m4 | 7 +- m4/extern-inline.m4 | 14 +- m4/fcntl-o.m4 | 2 +- m4/getopt.m4 | 2 +- m4/gettimeofday.m4 | 2 +- m4/glibc2.m4 | 2 +- m4/glibc21.m4 | 2 +- m4/gnulib-common.m4 | 54 ++--- m4/gnulib-comp.m4 | 6 +- m4/gnulib-tool.m4 | 2 +- m4/iconv.m4 | 61 +++--- m4/iconv_h.m4 | 2 +- m4/iconv_open.m4 | 2 +- m4/include_next.m4 | 2 +- m4/inline.m4 | 2 +- m4/intdiv0.m4 | 2 +- m4/intl.m4 | 41 +++- m4/intmax.m4 | 2 +- m4/inttypes-pri.m4 | 2 +- m4/inttypes_h.m4 | 2 +- m4/lib-ld.m4 | 2 +- m4/lib-link.m4 | 2 +- m4/lib-prefix.m4 | 2 +- m4/libunistring-base.m4 | 2 +- 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/lock.m4 | 2 +- m4/longlong.m4 | 2 +- m4/mbrtowc.m4 | 2 +- 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/nocrash.m4 | 2 +- m4/off_t.m4 | 2 +- m4/po.m4 | 4 +- m4/printf-posix.m4 | 2 +- m4/progtest.m4 | 2 +- m4/size_max.m4 | 2 +- m4/ssize_t.m4 | 2 +- m4/stdbool.m4 | 2 +- m4/stddef_h.m4 | 10 +- m4/stdint.m4 | 2 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 31 ++- m4/stdlib_h.m4 | 4 +- m4/string_h.m4 | 2 +- m4/strstr.m4 | 2 +- m4/sys_socket_h.m4 | 2 +- m4/sys_stat_h.m4 | 2 +- m4/sys_time_h.m4 | 3 +- m4/sys_types_h.m4 | 2 +- m4/threadlib.m4 | 40 +++- m4/time_h.m4 | 22 +- m4/uintmax_t.m4 | 2 +- m4/unistd_h.m4 | 6 +- m4/visibility.m4 | 2 +- m4/warn-on-use.m4 | 2 +- m4/wchar_h.m4 | 2 +- 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 | 2 +- m4/wint_t.m4 | 2 +- m4/wmemcpy.m4 | 2 +- m4/xsize.m4 | 2 +- src/Makefile.in | 36 ++- 160 files changed, 1028 insertions(+), 458 deletions(-) diff --git a/Makefile.in b/Makefile.in index bd58e00..2e8b582 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# 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, @@ -17,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, Makefile.am, contains the top-level Makefile for Star # Traders. It needs to be processed by automake to produce the @@ -42,7 +42,17 @@ # 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 = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ ?) ;; \ @@ -105,18 +115,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in 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/install-sh build-aux/missing \ - $(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 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 \ @@ -161,6 +159,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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 $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -224,6 +224,16 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(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/compile build-aux/config.guess \ + 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) top_distdir = $(distdir) @@ -431,6 +441,7 @@ 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@ @@ -480,6 +491,7 @@ 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_TTYNAME_R = @GNULIB_TTYNAME_R@ @@ -613,6 +625,7 @@ 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@ @@ -681,6 +694,7 @@ 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_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -883,9 +897,11 @@ 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@ @@ -916,6 +932,7 @@ 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@ @@ -951,6 +968,7 @@ 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@ @@ -1047,7 +1065,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1268,15 +1285,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -1312,17 +1329,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1497,6 +1514,8 @@ uninstall-am: mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/aclocal.m4 b/aclocal.m4 index a45a374..3a2d63a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# 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, @@ -20,7 +20,7 @@ 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'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# 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, @@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,7 +572,11 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -602,7 +605,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +647,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +697,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +736,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -762,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -809,7 +812,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# 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, @@ -909,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -969,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -997,7 +1000,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/build-aux/config.rpath b/build-aux/config.rpath index b625621..a3e25c8 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-2014 Free Software Foundation, Inc. +# Copyright 1996-2015 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 9ee8b15..0d55e2b 100644 --- a/build-aux/snippet/arg-nonnull.h +++ b/build-aux/snippet/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 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/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h index 67b1233..585b38a 100644 --- a/build-aux/snippet/c++defs.h +++ b/build-aux/snippet/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 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/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h index 41d9510..f507eb7 100644 --- a/build-aux/snippet/unused-parameter.h +++ b/build-aux/snippet/unused-parameter.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific function parameters are not used. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 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/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h index 1c4d7bd..90f4985 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/build-aux/snippet/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 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/config.h.in b/config.h.in index 717045a..ec23eba 100644 --- a/config.h.in +++ b/config.h.in @@ -30,6 +30,10 @@ whether the gnulib module fscanf shall be considered present. */ #undef GNULIB_FSCANF +/* Define to 1 if printf and friends should be labeled with attribute + "__gnu_printf__" instead of "__printf__" */ +#undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module scanf shall be considered present. */ #undef GNULIB_SCANF @@ -917,6 +921,10 @@ #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 @@ -1052,17 +1060,19 @@ # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ # define _GL_INLINE_HEADER_CONST_PRAGMA # else # define _GL_INLINE_HEADER_CONST_PRAGMA \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") # endif - /* Suppress GCC's bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - . */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/configure b/configure index ca81d12..16e9c09 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.6. +# Generated by GNU Autoconf 2.69 for Star Traders 7.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.6' -PACKAGE_STRING='Star Traders 7.6' +PACKAGE_VERSION='7.7' +PACKAGE_STRING='Star Traders 7.7' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='http://www.zap.org.au/software/trader/' @@ -668,6 +668,7 @@ LIBUNISTRING_UNISTR_H HAVE_UNISTD_H NEXT_AS_FIRST_DIRECTIVE_UNISTD_H NEXT_UNISTD_H +UNISTD_H_DEFINES_STRUCT_TIMESPEC PTHREAD_H_DEFINES_STRUCT_TIMESPEC SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC @@ -683,6 +684,7 @@ HAVE_TIMEGM HAVE_STRPTIME HAVE_NANOSLEEP HAVE_DECL_LOCALTIME_R +GNULIB_TIME_RZ GNULIB_TIME_R GNULIB_TIMEGM GNULIB_STRPTIME @@ -945,6 +947,7 @@ REPLACE_SETENV REPLACE_REALPATH REPLACE_REALLOC REPLACE_RANDOM_R +REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R REPLACE_PTSNAME @@ -996,6 +999,7 @@ GNULIB_REALPATH GNULIB_REALLOC_POSIX GNULIB_RANDOM_R GNULIB_RANDOM +GNULIB_QSORT_R GNULIB_PUTENV GNULIB_PTSNAME_R GNULIB_PTSNAME @@ -1026,6 +1030,7 @@ GL_GENERATE_STDDEF_H_FALSE GL_GENERATE_STDDEF_H_TRUE STDDEF_H HAVE_WCHAR_T +HAVE_MAX_ALIGN_T REPLACE_NULL REPLACE_STRUCT_LCONV REPLACE_DUPLOCALE @@ -1052,6 +1057,7 @@ 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 @@ -1072,9 +1078,11 @@ REPLACE_USLEEP REPLACE_UNLINKAT REPLACE_UNLINK REPLACE_TTYNAME_R +REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP REPLACE_RMDIR +REPLACE_READLINKAT REPLACE_READLINK REPLACE_READ REPLACE_PWRITE @@ -1961,7 +1969,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.6 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2031,7 +2039,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.6:";; + short | recursive ) echo "Configuration of Star Traders 7.7:";; esac cat <<\_ACEOF @@ -2138,7 +2146,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.6 +Star Traders configure 7.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2790,7 +2798,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.6, which was +It was created by Star Traders $as_me 7.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3200,7 +3208,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers config.h" -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3372,8 +3380,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3392,7 +3400,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3686,7 +3694,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.6' + VERSION='7.7' cat >>confdefs.h <<_ACEOF @@ -3720,8 +3728,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3780,6 +3788,7 @@ END fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5400,12 +5409,12 @@ else fi if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi else if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi @@ -5701,6 +5710,8 @@ $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 _TANDEM_SOURCE 1" >>confdefs.h @@ -5872,26 +5883,36 @@ $as_echo "$ac_cv_cflags_warn_all" >&6; } case ".$ac_cv_cflags_warn_all" in .ok|.ok,*) ;; .|.no|.no,*) ;; - *) if ${CFLAGS+:} false; then : - case " $CFLAGS " in - *" $ac_cv_cflags_warn_all "*) - { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$ac_cv_cflags_warn_all"; } >&5 + *) +if ${CFLAGS+:} false; then : + + case " $CFLAGS " in #( + *" $ac_cv_cflags_warn_all "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$ac_cv_cflags_warn_all"; } >&5 (: CFLAGS already contains $ac_cv_cflags_warn_all) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - ;; - *) - { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5 - (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CFLAGS " $ac_cv_cflags_warn_all" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - CFLAGS="$CFLAGS $ac_cv_cflags_warn_all" - ;; - esac + ;; +esac + else - CFLAGS="$ac_cv_cflags_warn_all" + + CFLAGS=$ac_cv_cflags_warn_all + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + fi ;; esac @@ -6051,7 +6072,7 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.18 + GETTEXT_MACRO_VERSION=0.19 @@ -7373,36 +7394,42 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac - + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -int main () + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () { - int result = 0; +int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -7415,14 +7442,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -7434,14 +7461,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -7454,14 +7481,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -7481,17 +7508,20 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; + + ; + return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes -else - am_cv_func_iconv_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 + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" fi @@ -8647,9 +8677,11 @@ $as_echo "$gt_cv_locale_fr" >&6; } REPLACE_PWRITE=0; REPLACE_READ=0; REPLACE_READLINK=0; + REPLACE_READLINKAT=0; REPLACE_RMDIR=0; REPLACE_SLEEP=0; REPLACE_SYMLINK=0; + REPLACE_SYMLINKAT=0; REPLACE_TTYNAME_R=0; REPLACE_UNLINK=0; REPLACE_UNLINKAT=0; @@ -9434,17 +9466,19 @@ else for ac_kw in __restrict __restrict__ _Restrict restrict; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - } +typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + int main () { int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t) + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ; return 0; } @@ -9475,6 +9509,7 @@ _ACEOF HAVE_GETTIMEOFDAY=1; HAVE_STRUCT_TIMEVAL=1; HAVE_SYS_TIME_H=1; + HAVE_TIMEZONE_T=0; REPLACE_GETTIMEOFDAY=0; REPLACE_STRUCT_TIMEVAL=0; @@ -9841,36 +9876,42 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac - + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -int main () + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () { - int result = 0; +int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -9883,14 +9924,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -9902,14 +9943,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -9922,14 +9963,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -9949,17 +9990,20 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; + + ; + return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes -else - am_cv_func_iconv_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 + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" fi @@ -10300,6 +10344,7 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; } REPLACE_NULL=0; + HAVE_MAX_ALIGN_T=1; HAVE_WCHAR_T=1; @@ -10339,6 +10384,15 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h STDDEF_H= + ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include + +" +if test "x$ac_cv_type_max_align_t" = xyes; then : + +else + HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h +fi + if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -10929,6 +10983,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } 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; @@ -10980,6 +11035,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; + REPLACE_QSORT_R=0; REPLACE_RANDOM_R=0; REPLACE_REALLOC=0; REPLACE_REALPATH=0; @@ -12696,6 +12752,7 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; } 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; @@ -12741,6 +12798,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; } TIME_H_DEFINES_STRUCT_TIMESPEC=0 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 + UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then TIME_H_DEFINES_STRUCT_TIMESPEC=1 else @@ -12801,6 +12859,36 @@ fi $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_unistd_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +static struct timespec x; x.tv_sec = x.tv_nsec; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timespec_in_unistd_h=yes +else + gl_cv_sys_struct_timespec_in_unistd_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_sys_struct_timespec_in_unistd_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } + if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then + UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 + fi fi fi fi @@ -12819,6 +12907,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_time_h='<'time.h'>' else @@ -15355,6 +15444,15 @@ fi STDDEF_H= + ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include + +" +if test "x$ac_cv_type_max_align_t" = xyes; then : + +else + HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h +fi + if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -15484,6 +15582,8 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } + + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else @@ -15548,6 +15648,48 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 +$as_echo_n "checking which flavor of printf attribute matches inttypes macros... " >&6; } +if ${gl_cv_func_printf_attribute_flavor+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define __STDC_FORMAT_MACROS 1 + #include + #include + /* For non-mingw systems, compilation will trivially succeed. + For mingw, compilation will succeed for older mingw (system + printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ + #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_printf_attribute_flavor=system +else + gl_cv_func_printf_attribute_flavor=gnu +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 +$as_echo "$gl_cv_func_printf_attribute_flavor" >&6; } + if test "$gl_cv_func_printf_attribute_flavor" = gnu; then + +$as_echo "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h + + fi + GNULIB_FSCANF=1 @@ -16284,7 +16426,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 2 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -16383,7 +16525,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -18945,7 +19087,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.6, which was +This file was extended by Star Traders $as_me 7.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19012,7 +19154,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.6 +Star Traders config.status 7.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/doc/Makefile.in b/doc/Makefile.in index 33c9245..96dfe44 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# 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, @@ -17,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 514 2014-05-22 01:05:51Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, doc/Makefile.am, contains the documentation directory # Makefile for Star Traders. It needs to be processed by automake to @@ -42,7 +42,17 @@ # 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 = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ ?) ;; \ @@ -105,8 +115,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_man6_MANS) README 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 \ @@ -151,6 +159,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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 $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -206,6 +215,7 @@ am__installdirs = "$(DESTDIR)$(man6dir)" NROFF = nroff MANS = $(dist_man6_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(dist_man6_MANS) $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -372,6 +382,7 @@ 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@ @@ -421,6 +432,7 @@ 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_TTYNAME_R = @GNULIB_TTYNAME_R@ @@ -554,6 +566,7 @@ 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@ @@ -622,6 +635,7 @@ 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_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -824,9 +838,11 @@ 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@ @@ -857,6 +873,7 @@ 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@ @@ -892,6 +909,7 @@ 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@ @@ -977,7 +995,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1192,6 +1209,8 @@ uninstall-man: uninstall-man6 pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man6 +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Makefile.am b/lib/Makefile.am index dddf7a5..bcb8d13 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -565,6 +565,7 @@ stddef.h: stddef.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_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ + -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ < $(srcdir)/stddef.in.h; \ @@ -791,6 +792,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ @@ -842,6 +844,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ @@ -1132,10 +1135,12 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -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|@''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|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ @@ -1145,6 +1150,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -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' \ + -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|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)' \ @@ -1288,9 +1294,11 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ diff --git a/lib/Makefile.in b/lib/Makefile.in index b025482..0bbeb31 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# 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, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -40,7 +40,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ ?) ;; \ @@ -105,8 +115,6 @@ 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 subdir = lib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) README 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 \ @@ -151,6 +159,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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 $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -249,6 +259,8 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -440,6 +452,7 @@ 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@ @@ -489,6 +502,7 @@ 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_TTYNAME_R = @GNULIB_TTYNAME_R@ @@ -622,6 +636,7 @@ 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@ @@ -690,6 +705,7 @@ 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_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -892,9 +908,11 @@ 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@ @@ -925,6 +943,7 @@ 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@ @@ -960,6 +979,7 @@ 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@ @@ -1151,7 +1171,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnits lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1543,6 +1562,8 @@ uninstall-am: uninstall-local mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-local +.PRECIOUS: Makefile + # Listed in the same order as the GNU makefile conventions, and # provided by autoconf 2.59c+ or 2.70. @@ -1779,6 +1800,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ @@ -1973,6 +1995,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ @@ -2024,6 +2047,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ @@ -2238,10 +2262,12 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -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|@''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|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ @@ -2251,6 +2277,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -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' \ + -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|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)' \ @@ -2384,9 +2411,11 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ diff --git a/lib/btowc.c b/lib/btowc.c index b06ca2e..2e32dee 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/c-ctype.c b/lib/c-ctype.c index 48c6478..1fb5fe6 100644 --- a/lib/c-ctype.c +++ b/lib/c-ctype.c @@ -1,6 +1,6 @@ /* Character handling in C locale. - Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc. + Copyright 2000-2003, 2006, 2009-2015 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-ctype.h b/lib/c-ctype.h index b465277..4764473 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2015 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-strcase.h b/lib/c-strcase.h index 8e66044..f25bcca 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-2014 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 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 b9b26a4..6deb6d1 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2015 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 972eb80..b98e368 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2015 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 289bc44..f06d7e9 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2015 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 @@ -348,12 +348,10 @@ case "$os" in #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" ;; - freebsd* | os2*) + freebsd*) # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore # localcharset.c falls back to using the full locale name # from the environment variables. - # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just - # reuse FreeBSD's locale data for OS/2. echo "C ASCII" echo "US-ASCII ASCII" for l in la_LN lt_LN; do diff --git a/lib/crc.c b/lib/crc.c index 5970ef9..b60a507 100644 --- a/lib/crc.c +++ b/lib/crc.c @@ -1,5 +1,5 @@ /* crc.c -- cyclic redundancy checks - Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 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 9095864..3f18022 100644 --- a/lib/crc.h +++ b/lib/crc.h @@ -1,5 +1,5 @@ /* crc.h -- cyclic redundancy checks - Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 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.c b/lib/getopt.c index 7d950af..212cbf7 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -2,7 +2,7 @@ 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-2014 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -487,7 +487,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, 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; @@ -514,22 +527,37 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, 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)); - newp->p = p; - newp->next = ambig_list; - ambig_list = 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_list != NULL && !exact) + if ((ambig || ambig_list) && !exact) { - if (print_errors) + if (print_errors && ambig_list) { struct option_list first; first.p = pfound; @@ -585,18 +613,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, 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 '?'; } - while (ambig_list != NULL) - { - struct option_list *pn = ambig_list->next; - free (ambig_list); - ambig_list = pn; - } + free_option_list (ambig_list); if (pfound != NULL) { diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 7ab99fb..9248f76 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getopt1.c b/lib/getopt1.c index a184865..2b1feb6 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getopt_int.h b/lib/getopt_int.h index 24ed672..e893a6e 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/gettext.h b/lib/gettext.h index c7d6fd3..599a14e 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 8b2058e..e0e2e69 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2015 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.c b/lib/iconv.c index b5a427b..28c13c5 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2015 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 d0e9836..94ab806 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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 d66c115..59e0aca 100644 --- a/lib/iconv_close.c +++ b/lib/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 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 37ce9ce..09d042d 100644 --- a/lib/iconv_open.c +++ b/lib/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 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/localcharset.c b/lib/localcharset.c index ccfa993..1f02aa5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2015 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 @@ -128,7 +128,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) +#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) const char *dir; const char *base = "charset.alias"; char *file_name; @@ -342,6 +342,36 @@ get_charset_aliases (void) "CP54936" "\0" "GB18030" "\0" "CP65001" "\0" "UTF-8" "\0"; # endif +# if defined OS2 + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ + + /* The list of encodings is taken from "List of OS/2 Codepages" + by Alex Taylor: + . + See also "IBM Globalization - Code page identifiers": + . */ + cp = "CP813" "\0" "ISO-8859-7" "\0" + "CP878" "\0" "KOI8-R" "\0" + "CP819" "\0" "ISO-8859-1" "\0" + "CP912" "\0" "ISO-8859-2" "\0" + "CP913" "\0" "ISO-8859-3" "\0" + "CP914" "\0" "ISO-8859-4" "\0" + "CP915" "\0" "ISO-8859-5" "\0" + "CP916" "\0" "ISO-8859-8" "\0" + "CP920" "\0" "ISO-8859-9" "\0" + "CP921" "\0" "ISO-8859-13" "\0" + "CP923" "\0" "ISO-8859-15" "\0" + "CP954" "\0" "EUC-JP" "\0" + "CP964" "\0" "EUC-TW" "\0" + "CP970" "\0" "EUC-KR" "\0" + "CP1089" "\0" "ISO-8859-6" "\0" + "CP1208" "\0" "UTF-8" "\0" + "CP1381" "\0" "GB2312" "\0" + "CP1386" "\0" "GBK" "\0" + "CP3372" "\0" "EUC-JP" "\0"; +# endif #endif charset_aliases = cp; @@ -499,6 +529,8 @@ locale_charset (void) ULONG cp[3]; ULONG cplen; + codeset = NULL; + /* Allow user to override the codeset, as set in the operating system, with standard language environment variables. */ locale = getenv ("LC_ALL"); @@ -530,10 +562,12 @@ locale_charset (void) } } - /* Resolve through the charset.alias file. */ - codeset = locale; + /* For the POSIX locale, don't use the system's codepage. */ + if (strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0) + codeset = ""; } - else + + if (codeset == NULL) { /* OS/2 has a function returning the locale's codepage as a number. */ if (DosQueryCp (sizeof (cp), cp, &cplen)) diff --git a/lib/localcharset.h b/lib/localcharset.h index 9011d58..c5e6d46 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2015 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 10cc44b..05e974d 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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/mbrtowc.c b/lib/mbrtowc.c index 5743f43..e49d55b 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsinit.c b/lib/mbsinit.c index df4bcd1..4effdd8 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h index d42af01..a0f4271 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 2a7019a..522eb69 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index 136ec34..c37eba7 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 3cc70b0..5c60478 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 93a7445..e58053d 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/memchr.c b/lib/memchr.c index 6709f6e..f74cc9a 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-2014 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015 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 0e14022..6cbe5b5 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2015 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 2dbcf7b..f50cf0a 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2015 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 651e8df..64a1761 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 f5c0e05..698307b 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 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 @@ -39,7 +39,6 @@ # if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) # ifdef __need_wint_t -# undef _@GUARD_PREFIX@_STDDEF_H # define _GL_STDDEF_WINT_T # endif # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ @@ -54,33 +53,56 @@ # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ -# ifndef _@GUARD_PREFIX@_STDDEF_H -# define _@GUARD_PREFIX@_STDDEF_H - /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ -#if @REPLACE_NULL@ -# undef NULL -# ifdef __cplusplus +# if (@REPLACE_NULL@ \ + && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T)) +# undef NULL +# ifdef __cplusplus /* ISO C++ says that the macro NULL must expand to an integer constant expression, hence '((void *) 0)' is not allowed in C++. */ -# if __GNUG__ >= 3 +# if __GNUG__ >= 3 /* GNU C++ has a __null macro that behaves like an integer ('int' or 'long') but has the same size as a pointer. Use that, to avoid warnings. */ -# define NULL __null -# else -# define NULL 0L +# define NULL __null +# else +# define NULL 0L +# endif +# else +# define NULL ((void *) 0) +# endif # endif -# else -# define NULL ((void *) 0) -# endif -#endif + +# ifndef _@GUARD_PREFIX@_STDDEF_H +# define _@GUARD_PREFIX@_STDDEF_H /* Some platforms lack wchar_t. */ #if !@HAVE_WCHAR_T@ # define wchar_t int #endif +/* Some platforms lack max_align_t. */ +#if !@HAVE_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 + using __alignof__ (which returns 8 for double) rather than _Alignof + (which returns 4), and align each union member accordingly. */ +# ifdef __GNUC__ +# define _GL_STDDEF_ALIGNAS(type) \ + __attribute__ ((__aligned__ (__alignof__ (type)))) +# else +# define _GL_STDDEF_ALIGNAS(type) /* */ +# endif +typedef union +{ + char *__p _GL_STDDEF_ALIGNAS (char *); + double __d _GL_STDDEF_ALIGNAS (double); + long double __ld _GL_STDDEF_ALIGNAS (long double); + long int __i _GL_STDDEF_ALIGNAS (long int); +} max_align_t; +#endif + # endif /* _@GUARD_PREFIX@_STDDEF_H */ # endif /* _@GUARD_PREFIX@_STDDEF_H */ #endif /* __need_XXX */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 247f0d8..378de2e 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 1e1fe84..ec43874 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2015 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 @@ -84,8 +84,13 @@ except that it indicates to GCC that the supported format string directives are the ones of the system printf(), rather than the ones standardized by ISO C99 and POSIX. */ -#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ +#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU +# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument) +#else +# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) +#endif /* _GL_ATTRIBUTE_FORMAT_SCANF indicates to GCC that the function takes a format string and arguments, @@ -718,11 +723,10 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " so any use of gets warrants an unconditional warning; besides, C11 removed it. */ #undef gets -#if HAVE_RAW_DECL_GETS +#if HAVE_RAW_DECL_GETS && !defined __cplusplus _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ struct obstack; /* Grow an obstack with formatted output. Return the number of diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 46e10db..428a119 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2015 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 @@ -520,6 +520,29 @@ _GL_CXXALIAS_SYS (putenv, int, (char *string)); _GL_CXXALIASWARN (putenv); #endif +#if @GNULIB_QSORT_R@ +# if @REPLACE_QSORT_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef qsort_r +# define qsort_r rpl_qsort_r +# endif +_GL_FUNCDECL_RPL (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))); +_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg)); +# else +_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); +#endif + #if @GNULIB_RANDOM_R@ # if !@HAVE_RANDOM_R@ diff --git a/lib/str-two-way.h b/lib/str-two-way.h index 49ee746..6e10c8e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake , 2008. diff --git a/lib/streq.h b/lib/streq.h index 0e62fb9..6107fc6 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2015 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 2495d81..6f7dad8 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2015 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 5747731..33cc212 100644 --- a/lib/striconv.h +++ b/lib/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2015 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 9062142..2abd6bc 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2015 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 @@ -15,16 +15,32 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#ifndef _@GUARD_PREFIX@_STRING_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if defined _GL_ALREADY_INCLUDING_STRING_H +/* Special invocation convention: + - On OS X/NetBSD we have a sequence of nested includes + -> -> "string.h" + In this situation system _chk variants due to -D_FORTIFY_SOURCE + might be used after any replacements defined here. */ + +#@INCLUDE_NEXT@ @NEXT_STRING_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_STRING_H + +#define _GL_ALREADY_INCLUDING_STRING_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ +#undef _GL_ALREADY_INCLUDING_STRING_H + #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H @@ -1027,3 +1043,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - " #endif /* _@GUARD_PREFIX@_STRING_H */ #endif /* _@GUARD_PREFIX@_STRING_H */ +#endif diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 363776a..48272a8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 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 b2f956f..794e436 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 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 d5b9d78..fbc11a2 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index b47a7ff..9f5e853 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 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/sys_time.in.h b/lib/sys_time.in.h index 30057ad..c556c5d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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/sys_types.in.h b/lib/sys_types.in.h index deb5d67..814bc17 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 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/time.in.h b/lib/time.in.h index 81abdf4..a90552c 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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 @@ -22,11 +22,13 @@ /* Don't get in the way of glibc when it includes time.h merely to declare a few standard symbols, rather than to declare all the - symbols. Also, Solaris 8 eventually includes itself + symbols. (However, skip this for MinGW as it treats __need_time_t + incompatibly.) Also, Solaris 8 eventually includes itself recursively; if that is happening, just include the system without adding our own declarations. */ -#if (defined __need_time_t || defined __need_clock_t \ - || defined __need_timespec \ +#if (((defined __need_time_t || defined __need_clock_t \ + || defined __need_timespec) \ + && !defined __MINGW32__) \ || defined _@GUARD_PREFIX@_TIME_H) # @INCLUDE_NEXT@ @NEXT_TIME_H@ @@ -55,6 +57,8 @@ # include # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include +# elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +# include # else # ifdef __cplusplus @@ -229,6 +233,25 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf, _GL_CXXALIASWARN (strptime); # 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)); +_GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); +_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); +_GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); +_GL_FUNCDECL_SYS (localtime_rz, struct tm *, + (timezone_t __tz, time_t const *restrict __timer, + struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3))); +_GL_CXXALIAS_SYS (localtime_rz, struct tm *, + (timezone_t __tz, time_t const *restrict __timer, + struct tm *restrict __result)); +_GL_FUNCDECL_SYS (mktime_z, time_t, + (timezone_t __tz, struct tm *restrict __result) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_SYS (mktime_z, time_t, + (timezone_t __tz, struct tm *restrict __result)); +# endif + /* Convert TM to a time_t value, assuming UTC. */ # if @GNULIB_TIMEGM@ # if @REPLACE_TIMEGM@ diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 622b228..958fea2 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 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 @@ -401,6 +401,12 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " /* Set of environment variables and values. An array of strings of the form "VARIABLE=VALUE", terminated with a NULL. */ # if defined __APPLE__ && defined __MACH__ +# include +# if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR +# define _GL_USE_CRT_EXTERNS +# endif +# endif +# ifdef _GL_USE_CRT_EXTERNS # include # define environ (*_NSGetEnviron ()) # else @@ -1287,13 +1293,24 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - " #if @GNULIB_READLINKAT@ -# if !@HAVE_READLINKAT@ +# if @REPLACE_READLINKAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define readlinkat rpl_readlinkat +# endif +_GL_FUNCDECL_RPL (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len) + _GL_ARG_NONNULL ((2, 3))); +_GL_CXXALIAS_RPL (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len)); +# else +# if !@HAVE_READLINKAT@ _GL_FUNCDECL_SYS (readlinkat, ssize_t, (int fd, char const *file, char *buf, size_t len) _GL_ARG_NONNULL ((2, 3))); -# endif +# endif _GL_CXXALIAS_SYS (readlinkat, ssize_t, (int fd, char const *file, char *buf, size_t len)); +# endif _GL_CXXALIASWARN (readlinkat); #elif defined GNULIB_POSIXCHECK # undef readlinkat @@ -1407,13 +1424,25 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - " #if @GNULIB_SYMLINKAT@ -# if !@HAVE_SYMLINKAT@ +# if @REPLACE_SYMLINKAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef symlinkat +# define symlinkat rpl_symlinkat +# endif +_GL_FUNCDECL_RPL (symlinkat, int, + (char const *contents, int fd, char const *file) + _GL_ARG_NONNULL ((1, 3))); +_GL_CXXALIAS_RPL (symlinkat, int, + (char const *contents, int fd, char const *file)); +# else +# if !@HAVE_SYMLINKAT@ _GL_FUNCDECL_SYS (symlinkat, int, (char const *contents, int fd, char const *file) _GL_ARG_NONNULL ((1, 3))); -# endif +# endif _GL_CXXALIAS_SYS (symlinkat, int, (char const *contents, int fd, char const *file)); +# endif _GL_CXXALIASWARN (symlinkat); #elif defined GNULIB_POSIXCHECK # undef symlinkat diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 222c959..be158be 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2015 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/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c index b11543a..9cc1500 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c index 8fdd88b..65445be 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index df9b227..a8250f4 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h index bc302c2..d3c47ae 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2015 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 a25e514..60eba49 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 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/wchar.in.h b/lib/wchar.in.h index 473285f..684299f 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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 @@ -30,9 +30,14 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H +#if (((defined __need_mbstate_t || defined __need_wint_t) \ + && !defined __MINGW32__) \ + || (defined __hpux \ + && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ + || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - - Inside glibc and uClibc header files. + - Inside glibc and uClibc header files, but not MinGW. - On HP-UX 11.00 we have a sequence of nested includes -> -> , and the latter includes , once indirectly -> -> -> diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 1d340cd..b38d2e0 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 b733a14..ac9ca1d 100644 --- a/lib/wcsdup-impl.h +++ b/lib/wcsdup-impl.h @@ -1,5 +1,5 @@ /* Duplicate a wide string. - Copyright (C) 1999, 2011-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 1999. This program is free software: you can redistribute it and/or modify diff --git a/lib/wcsdup.c b/lib/wcsdup.c index a0f72a9..80c0cc0 100644 --- a/lib/wcsdup.c +++ b/lib/wcsdup.c @@ -1,5 +1,5 @@ /* Duplicate a wide string. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctob.c b/lib/wctob.c index d87d180..3ff6c7b 100644 --- a/lib/wctob.c +++ b/lib/wctob.c @@ -1,5 +1,5 @@ /* Convert wide character to unibyte character. - Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 0fa170e..41217d5 100644 --- a/lib/wctomb-impl.h +++ b/lib/wctomb-impl.h @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctomb.c b/lib/wctomb.c index b3595a4..8022aa8 100644 --- a/lib/wctomb.c +++ b/lib/wctomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 ab06653..9050b7e 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 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/wmemcpy-impl.h b/lib/wmemcpy-impl.h index 06478e5..3e6b585 100644 --- a/lib/wmemcpy-impl.h +++ b/lib/wmemcpy-impl.h @@ -1,5 +1,5 @@ /* Copy wide character array. - Copyright (C) 1999, 2011-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 1999. This program is free software: you can redistribute it and/or modify diff --git a/lib/wmemcpy.c b/lib/wmemcpy.c index 78584ee..31e06a7 100644 --- a/lib/wmemcpy.c +++ b/lib/wmemcpy.c @@ -1,5 +1,5 @@ /* Copy wide character array. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 8eca551..c7103ed 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 3 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 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 481eadc..e29a840 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# 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, @@ -17,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 524 2014-05-23 21:31:22Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, m4/Makefile.am, contains the m4 macro directory Makefile for # Star Traders. It needs to be processed by automake to produce the @@ -42,7 +42,17 @@ # 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 = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ ?) ;; \ @@ -105,7 +115,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README 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 \ @@ -150,6 +159,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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 $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -174,6 +184,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac 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@ @@ -340,6 +351,7 @@ 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@ @@ -389,6 +401,7 @@ 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_TTYNAME_R = @GNULIB_TTYNAME_R@ @@ -522,6 +535,7 @@ 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@ @@ -590,6 +604,7 @@ 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_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -792,9 +807,11 @@ 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@ @@ -825,6 +842,7 @@ 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@ @@ -860,6 +878,7 @@ 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@ @@ -952,7 +971,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign m4/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1120,6 +1138,8 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index ce3e39e..bc19dfc 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 16 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 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 b9bb634..0f95ee3 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-2015 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 9988944..c1da65d 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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/config-h.m4 b/m4/config-h.m4 index 5262996..d1ffbae 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 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 0cd86cf..49d3a13 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ # configmake.m4 serial 2 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 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 37f55ca..35bc49c 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 13 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2015 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. @@ -68,6 +68,10 @@ 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 @@ -100,6 +104,7 @@ 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([_TANDEM_SOURCE]) AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 7f1bb39..7280065 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-2014 Free Software Foundation, Inc. +dnl Copyright 2012-2015 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. @@ -74,17 +74,19 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ # define _GL_INLINE_HEADER_CONST_PRAGMA # else # define _GL_INLINE_HEADER_CONST_PRAGMA \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") # endif - /* Suppress GCC's bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - . */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 43c9312..891a62f 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 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 f127028..e76e501 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ # getopt.m4 serial 44 -dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2015 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/gettimeofday.m4 b/m4/gettimeofday.m4 index 1c2d66e..ce246e1 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 21 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 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/glibc2.m4 b/m4/glibc2.m4 index 71dd8a1..216c863 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-2014 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 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/glibc21.m4 b/m4/glibc21.m4 index ab58b71..3a971c5 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-2014 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 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 35f6195..40e82f6 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 35 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# gnulib-common.m4 serial 36 +dnl Copyright (C) 2007-2015 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. @@ -278,12 +278,12 @@ Amsterdam dnl but prefer ${host}-ar over ar (useful for cross-compiling). AC_CHECK_TOOL([AR], [ar], [ar]) if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi else if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi AC_SUBST([AR]) @@ -319,26 +319,28 @@ m4_ifdef([AC_PROG_MKDIR_P], [ ]) # AC_C_RESTRICT -# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, -# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ -# works. -# This definition can be removed once autoconf >= 2.62 can be assumed. -# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. -m4_ifndef([AC_AUTOCONF_VERSION],[ +# This definition is copied from post-2.69 Autoconf and overrides the +# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed +# once autoconf >= 2.70 can be assumed. It's painful to check version +# numbers, and in practice this macro is more up-to-date than Autoconf +# is, so override Autoconf unconditionally. AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no # The order here caters to the fact that C++ does not require restrict. for ac_kw in __restrict __restrict__ _Restrict restrict; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - }]], - [[int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t)]])], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + ]], + [[int s[1]; + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ]])], [ac_cv_c_restrict=$ac_kw]) test "$ac_cv_c_restrict" != no && break done @@ -348,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT], nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict +# define __restrict__ #endif]) case $ac_cv_c_restrict in restrict) ;; no) AC_DEFINE([restrict], []) ;; *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; esac -]) -]) +])# AC_C_RESTRICT # gl_BIGENDIAN # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 7fd8195..2381ee7 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -239,12 +239,12 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P gl_HEADER_TIME_H gl_UNISTD_H - gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h]) + gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h]) gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) gl_MODULE_INDICATOR([unistr/u8-uctomb]) gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) - gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) + gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) gl_WCHAR_H gl_FUNC_WCRTOMB if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then diff --git a/m4/gnulib-tool.m4 b/m4/gnulib-tool.m4 index a588e15..fede1fc 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2005, 2009-2015 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 4b29c5f..4e37363 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 18 (gettext-0.18.2) +# iconv.m4 serial 19 (gettext-0.18.2) dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -72,27 +72,33 @@ AC_DEFUN([AM_ICONV_LINK], if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include -int main () -{ - int result = 0; + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + ]], + [[int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -105,14 +111,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -124,14 +130,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -144,14 +150,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -171,17 +177,14 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; -}]])], - [am_cv_func_iconv_works=yes], - [am_cv_func_iconv_works=no], - [ -changequote(,)dnl - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -changequote([,])dnl - ]) +]])], + [am_cv_func_iconv_works=yes], , + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index e992fa3..c6878fa 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 8 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 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 e0bfd72..177fccb 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ # iconv_open.m4 serial 14 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 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 69ad3db..233d254 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 23 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 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/inline.m4 b/m4/inline.m4 index c49957f..dc7063e 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 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 index afa9acb..44f9863 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2008, 2010-2015 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/intl.m4 b/m4/intl.m4 index 0c394ec..70d9a9e 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 27 (gettext-0.18.3) +# intl.m4 serial 29 (gettext-0.19) dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -42,6 +42,8 @@ AC_DEFUN([AM_INTL_SUBDIR], 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 @@ -230,6 +232,12 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], 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 @@ -240,8 +248,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], dnl intl/plural.c is generated from intl/plural.y. It requires bison, dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. + dnl bison-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 @@ -258,7 +265,7 @@ changequote(<<,>>)dnl ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + 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;; @@ -269,3 +276,29 @@ changequote([,])dnl 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/intmax.m4 b/m4/intmax.m4 index f70ceee..08b3a38 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005, 2008-2015 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 00251e1..0884e71 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2015 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 87be9cf..d0b5f5d 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2015 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 ddc569f..91ca911 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2015 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-link.m4 b/m4/lib-link.m4 index 3522d99..d8d5d1f 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2015 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 31f49e4..0465f47 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2015 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/libunistring-base.m4 b/m4/libunistring-base.m4 index d003267..cb8ae8a 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 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/localcharset.m4 b/m4/localcharset.m4 index ada2f01..f03916c 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2015 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 27db5ab..92ff552 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 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 c88fe8b..a3abef8 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 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 d3b2347..c5c4ef6 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 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 2838588..0d7bb34 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 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/lock.m4 b/m4/lock.m4 index 73a3c54..9fd4aa7 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 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/longlong.m4 b/m4/longlong.m4 index eefb37c..d57bc70 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2015 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 45696f5..c0d751d 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ # mbrtowc.m4 serial 26 -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation, +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 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/mbsinit.m4 b/m4/mbsinit.m4 index e1598a1..61c4032 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2015 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 6967f35..cea47e5 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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 068155a..42ad6cd 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2015 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 cacfe16..88cdeee 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 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 b9f126c..cb958d8 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2015 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 94ae2e2..92a88d0 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2015 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 2cb956d..fc575c1 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 7 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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/nocrash.m4 b/m4/nocrash.m4 index 5a5d77d..5628318 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 4 -dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2015 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/off_t.m4 b/m4/off_t.m4 index f5885b3..0eb1467 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 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 c737878..43012dc 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,4 +1,4 @@ -# po.m4 serial 23 (gettext-0.18.3) +# po.m4 serial 24 (gettext-0.19) dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS], 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.18]) + 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. diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 index 3be95c1..0f85ad6 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2015 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 b499f79..8706d52 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2015 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 7e192d5..186e3fd 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2015 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/ssize_t.m4 b/m4/ssize_t.m4 index fbe1d06..25bd451 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2015 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 006ed52..7273b82 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 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/stddef_h.m4 b/m4/stddef_h.m4 index c555e29..2310502 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ -dnl A placeholder for POSIX 2008 , for platforms that have issues. -# stddef_h.m4 serial 4 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl A placeholder for , for platforms that have issues. +# stddef_h.m4 serial 5 +dnl Copyright (C) 2009-2015 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. @@ -10,6 +10,9 @@ AC_DEFUN([gl_STDDEF_H], AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) STDDEF_H= + AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h], + [[#include + ]]) if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -43,5 +46,6 @@ AC_DEFUN([gl_STDDEF_H_DEFAULTS], [ dnl Assume proper GNU behavior unless another module says otherwise. REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) + HAVE_MAX_ALIGN_T=1; AC_SUBST([HAVE_MAX_ALIGN_T]) HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) ]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 1981d9d..4011a49 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 43 -dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2015 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 7fc2ce9..5097c0b 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2015 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/stdio_h.m4 b/m4/stdio_h.m4 index d15913a..f60cc21 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,14 +1,41 @@ -# stdio_h.m4 serial 43 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# stdio_h.m4 serial 46 +dnl Copyright (C) 2007-2015 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]) + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) + dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and + dnl inttypes.h behave like gnu instead of system; we must give our + dnl printf wrapper the right attribute to match. + AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros], + [gl_cv_func_printf_attribute_flavor], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #define __STDC_FORMAT_MACROS 1 + #include + #include + /* For non-mingw systems, compilation will trivially succeed. + For mingw, compilation will succeed for older mingw (system + printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ + #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; + #endif + ]])], [gl_cv_func_printf_attribute_flavor=system], + [gl_cv_func_printf_attribute_flavor=gnu])]) + if test "$gl_cv_func_printf_attribute_flavor" = gnu; then + AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1], + [Define to 1 if printf and friends should be labeled with + attribute "__gnu_printf__" instead of "__printf__"]) + fi + dnl No need to create extra modules for these functions. Everyone who uses dnl likely needs them. GNULIB_FSCANF=1 diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 03b448b..0b4c623 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 serial 42 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 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. @@ -55,6 +55,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) @@ -107,6 +108,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 64e683f..55d09ef 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,6 +1,6 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 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 33cd7a3..040c0b9 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,5 +1,5 @@ # strstr.m4 serial 16 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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_socket_h.m4 b/m4/sys_socket_h.m4 index 114d828..eaeabe7 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 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 eaa7642..6c909e8 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 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_time_h.m4 b/m4/sys_time_h.m4 index 5c79300..28c8b1a 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 8 -# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2015 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,6 +105,7 @@ 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 9748905..2232aec 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 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/threadlib.m4 b/m4/threadlib.m4 index a881702..8615ac9 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 10 (gettext-0.18.2) -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +# threadlib.m4 serial 11 (gettext-0.18.2) +dnl Copyright (C) 2005-2015 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. @@ -22,7 +22,7 @@ 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="" whereas LIBMULTITHREAD="-lpthread". +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. @@ -162,15 +162,31 @@ int main () # 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. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0);]])], - [gl_have_pthread=yes]) + # + # 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_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"; then + 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], @@ -185,7 +201,7 @@ int main () [Define if the pthread_in_use() detection is hard.]) esac ]) - else + 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 @@ -326,6 +342,8 @@ 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 diff --git a/m4/time_h.m4 b/m4/time_h.m4 index 9852778..754b469 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. -# serial 8 +# serial 9 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], ]) dnl Check whether 'struct timespec' is declared -dnl in time.h, sys/time.h, or pthread.h. +dnl in time.h, sys/time.h, pthread.h, or unistd.h. AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [ @@ -44,6 +44,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], TIME_H_DEFINES_STRUCT_TIMESPEC=0 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 + UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then TIME_H_DEFINES_STRUCT_TIMESPEC=1 else @@ -70,12 +71,26 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [gl_cv_sys_struct_timespec_in_pthread_h=no])]) if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 + else + AC_CACHE_CHECK([for struct timespec in ], + [gl_cv_sys_struct_timespec_in_unistd_h], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[static struct timespec x; x.tv_sec = x.tv_nsec;]])], + [gl_cv_sys_struct_timespec_in_unistd_h=yes], + [gl_cv_sys_struct_timespec_in_unistd_h=no])]) + if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then + UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 + fi fi fi fi AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC]) AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC]) AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC]) + AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) ]) AC_DEFUN([gl_TIME_MODULE_INDICATOR], @@ -94,6 +109,7 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], 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]) 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]) diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 index 0a94f17..8a92f58 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2007-2015 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/unistd_h.m4 b/m4/unistd_h.m4 index 1fa197e..b3c581f 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 67 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +# unistd_h.m4 serial 68 +dnl Copyright (C) 2006-2015 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. @@ -173,9 +173,11 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) REPLACE_READ=0; AC_SUBST([REPLACE_READ]) REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) + REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) + REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) 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/visibility.m4 b/m4/visibility.m4 index 552e397..6fff745 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008, 2010-2015 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/warn-on-use.m4 b/m4/warn-on-use.m4 index cc690f8..1e98dc9 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 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 85db952..9d1b0f8 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 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_t.m4 b/m4/wchar_t.m4 index 839a04c..dc964e6 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2015 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 844ef6a..7e3fe3f 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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 52ae488..66d7c92 100644 --- a/m4/wcsdup.m4 +++ b/m4/wcsdup.m4 @@ -1,5 +1,5 @@ # wcsdup.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 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 41f57af..501dc4a 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 10 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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 3b4ff79..05c6685 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 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 3fac0ee..95a4705 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -2,7 +2,7 @@ dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 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/wint_t.m4 b/m4/wint_t.m4 index 9b07b07..ca3fd44 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2015 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/wmemcpy.m4 b/m4/wmemcpy.m4 index bd35770..1b1494e 100644 --- a/m4/wmemcpy.m4 +++ b/m4/wmemcpy.m4 @@ -1,5 +1,5 @@ # wmemcpy.m4 serial 3 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 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 3af23ec..98faf7d 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2015 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/src/Makefile.in b/src/Makefile.in index 536b2d2..a2c5b11 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# 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, @@ -17,12 +17,12 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2014, John Zaitseff # +# Copyright (C) 1990-2015, John Zaitseff # # # ######################################################################### # Author: John Zaitseff -# $Id: Makefile.am 546 2014-06-18 10:56:09Z john $ +# $Id: Makefile.am 588 2015-08-17 21:27:22Z john $ # # This file, src/Makefile.am, contains the source-code Makefile for Star # Traders. It needs to be processed by automake to produce the @@ -43,7 +43,17 @@ # along with this program. If not, see http://www.gnu.org/licenses/. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +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 \ ?) ;; \ @@ -107,8 +117,6 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = trader$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp README 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 \ @@ -153,6 +161,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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 $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -224,6 +233,8 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -390,6 +401,7 @@ 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@ @@ -439,6 +451,7 @@ 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_TTYNAME_R = @GNULIB_TTYNAME_R@ @@ -572,6 +585,7 @@ 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@ @@ -640,6 +654,7 @@ 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_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -842,9 +857,11 @@ 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@ @@ -875,6 +892,7 @@ 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@ @@ -910,6 +928,7 @@ 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@ @@ -1011,7 +1030,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1436,6 +1454,8 @@ uninstall-am: uninstall-binPROGRAMS ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS +.PRECIOUS: Makefile + # 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. From 4f1f699f9e2ffb3e50fc7fca71f3df880547309e Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 09:52:04 +1000 Subject: [PATCH 24/25] Regenerate all PO and GMO translation files --- po/da.gmo | Bin 30370 -> 30457 bytes po/da.po | 2 +- po/de.gmo | Bin 31250 -> 31340 bytes po/de.po | 2 +- po/en@quot.gmo | Bin 29862 -> 29950 bytes po/en@quot.po | 124 ++++++++++++++++++++++++++----------------------- po/en_AU.gmo | Bin 29903 -> 29991 bytes po/en_AU.po | 2 +- po/en_CA.gmo | Bin 29901 -> 29989 bytes po/en_CA.po | 2 +- po/en_GB.gmo | Bin 29900 -> 29988 bytes po/en_GB.po | 2 +- po/en_US.gmo | Bin 29889 -> 29977 bytes po/en_US.po | 2 +- po/eo.gmo | Bin 30401 -> 30493 bytes po/eo.po | 2 +- po/fi.gmo | Bin 31074 -> 31174 bytes po/fi.po | 2 +- po/fr.gmo | Bin 31725 -> 31815 bytes po/fr.po | 2 +- po/hr.gmo | Bin 30579 -> 30670 bytes po/hr.po | 2 +- po/hu.gmo | Bin 0 -> 32438 bytes po/hu.po | 2 +- po/nb.gmo | Bin 30086 -> 30172 bytes po/nb.po | 2 +- po/ru.gmo | Bin 39197 -> 39297 bytes po/ru.po | 2 +- po/trader.pot | 118 ++++++++++++++++++++++++---------------------- 29 files changed, 142 insertions(+), 126 deletions(-) create mode 100644 po/hu.gmo diff --git a/po/da.gmo b/po/da.gmo index 68c98212df295074273b1bcba5611da3412e1440..04a52954675c3d96dff69640f087473c73abb70b 100644 GIT binary patch delta 4657 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 SiwpC1?G5CF?+P1vCHueE%lRk( diff --git a/po/da.po b/po/da.po index baff317..20e4946 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:05+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.gmo b/po/de.gmo index 5d781645de2889631c22cd50ea05c880caa4f688..edea0f826f9f90f5ed106a676d12e1db80d3ef27 100644 GIT binary patch delta 4657 zcmZA43tX1f0mt!!BB5O5A_$5K2zUbp1OyT_@d~1NNiEUBmIjJxNois)rj<*l1R0{K zq}4J-D5@>9OtUFVtrdPg(>7+Sma9H%Ik#Fh+wcFLv#t4j{J-DloacScbDnc~)!HjQ zUtIC=bcFeCGaT(Ch8*!TrniqVB|)k+=2WOLJ+KYKumdCUD-1z@DpeoNM>r<#pJ{7>}vvq#qS8*$Q(Gb;I8<06WvF?2c-%H}=FqsE*x$^u^3Z{+K)X z(2G=|+G#*_bU#MpVH|_)SjF>A1g$(tMJ?*a47xWFr(+^Epf4W9!FU3b@JrP9BN+~L zXgJ1UA*#Lt>WVXHnn(3X?G) z$~%-M8&#g|T#ss}1yk_17>j<~JP-$Oc49C@&j!mdHzleIUUoUGC^2bczqcfH| zZ+DhCE1WBwmCn`9wb+UK*Y#rj8AY>!3eDvXXS4GJs$=Id0fQJGUc#iK=C%+uLi1dC z6|!v1M%0?vi5ih6Ov4K}5(Bwu0#1%${Po5)ROn6Lbbf?ts54767$b26CSnfG#|*5; z{&*U@;a^c5`wjN$0iIkx{4-o9bNbtVWHzr-2i_X*250j^i>O z@I3}nUXsc)nXFYvUri&!rH&lMZ>j$bwJ1NyWGkY7mL2K>)S|0G-S-?$#5Np_p$sSQ z>M_$f$)%zahhhsd-R2Ld2EWB=I5OML^=4Fq`!OF+;XXPXNbhOTw2b6!u^rV;|2+Hs zQK+GxkIb%Fi&}qXhxddZAm_WNH~JiPL+~iOU526>oP&MvF6@gnsP8qS?t2Gy{W7xN zOvq@v29mKWV7J`(oZ$#$Pv4yiyRZ^>HZV(--AE%+E-Ms@7r zN&Md9UQEY-qAw;-w!d&`$Oba2Fauk#KYoIV=;>NuSM4xNreX%B>4K|&-qp8b0`)$H z_HVf)jHf&ahv5>`i|oWCJdA90^C8Az)D+upE~*1dkq&uGjl1v`YX5(YdXuCg+t5v@ z`f5~tGcx_=kH{7`iBs)^7NQ>1;CvM|Lchl@_>J?b(|4Ncng4Fy6Xwqu>5Os4V<#FI zh+#Mcci|}1RQ=BR7t~OjVmngVsI@X5yW%~l-Byjk*odJ#-!yZg#c&J<<2mHllz)NP zU%o6Xq4*GL4nM+JjGAHp9gu@sR5MWxm!Wsgkqu#5Fb}VwhCY3!{Q;Vdp6*nXa-zks z0yTH_sKxg>YK}j^M!br?tgbz?j5*NRn5X924iwY75U!V_hI|d`L674ezIPZC*`7Dw zYPV~3DeH#oHKmMyASdUkPy>I$IQ$x8F?yjfTQC zxv!Hk3sB!XU*^^nj^}$x<@QCFR`72JuGdyD{urRa z<4(Kya!{+g3N>Y|$ObVT$l#bk%k2oL=nryc5;lcGT3qh#J`osP?{hdZO>O56Z$= zF3dvRP>K2>*@=v(X~bOI=gJ+<51k)7KSg!)GYrBmtE}P9IOi~{$K-LM8w%ZpMb4EN zLHz^H?ao8a6Bx?%3(hZ`SDhiN?RJevy?G}3;T#OW1sJ0JU(N|rV%9i4?hEVjI_kHg zI#Q3p*n}Z?1jFzQs^N>+6FpnXI1*q~|^g%Fn+W#++Gh{T;kxCvQZ>zwe z1;l#s{=EKN6&&eAovKxVVHurid;HpY1Ro>quBith2YH>el84D`awB<}oFtEs9I}h#5iRP|xd3@T*ng@@6K?i|3?$0>BNtmCC?Kbw~_)ilfcPlvWcuB zapV=Ugd~#;Qci+M3Hi^F&&f=3JNYGfi0G&%KlPs3k6zG~OeWpPG4c+XMYiZQ_H&X# z#*=H0J=atmpgfKoyr%y6kIIWUpG0y=psR0mipR-r5=jQ!!ABJtL)MeEM8{T(_lM+e z&f{HqDn3i@B{z|$$wcx3QCrs&9Wmsn_so7Iwl;-s^{e|bD!4T{s$;Ovh`NCM{GiN~ p)a;bB?AX+t+>DI6dHKEnSCgHan$@~K|D1naLQzQTxG85-{tdkM14{q^ delta 4625 zcmZYBe|%5Z9mnyLN=XSK5+Vt{QHl5wM1CNWAZeoUtA1u^w~C*mN*7cU-7b~>plHR9 zw$?;T=t_+yWMfpP^`j`tL#tTzvG$Mcv3Aq7V^!L{-rxI4`^WCX`};iS-0wZ#bI&>V z#uwj&RDKiUeG(bE-f^5K@nlb9=h}rhH@vx8o!i~YxhQ-SBk?GTk!uHO2&ZE$ghAO|o9YkGl8Jpoh%p0f<8}Tb`u@!1yU6C=k zT;!h{#fNTW8mgbAsDZA*cDNY_;Q@S{-*>kuyh=kkz3IYuhBpNJVnj0C*{A&%T(ICsr)u@4O!Or**GH7=TwWiTblV&Cn zRnJ4VhZ}?13)4|Evj|hM2D9-)EX3AatQ(#b&;097SJ5DMqB?pXTi~bI7ypI*u?t%^ z9ZT?T+<;ASKWZRHuq$3b&EyXlz{C!I|AqJ@^%<(OslMffRbuP>w9GdmYu`yLcZq?&q&{F{;D)n2(jXg#mwv>aaYU4TaUHe!fI~ zKP<fk46LN!ZESHVycoOP+WvJ_3!uEIo z*=Oz&Y7bn;yD*;H*Ir3NJ(j5$?NNA81zd<)!)H-T@B*sC8asd3ylDQ@3?1a}`dHNW zdsuxas^15&BbJ(#W-WR;agIU&|82Hr{#8#$ZL;yG$7-t87g~K8>aksqn$qp4fgdr? zVO#1~QJeAxcEBci{&h)ttbZFC23W%w)MGaj)#0P4sak{T;1Fs+XRQ7gtPWwVt-kUe z|ButlsI{&`?eeo2gP)-WbPKgaQ3amgVebO}L@w%rV$=X;p+;PR>R<~7*BCX>OBjKF zM_qT*>dg!NALw9ap_ZZ;^_b5=^}EEg6Pr*|ycad{W5^)g=U9ndd4|^E0o1@o-%DpW z2m9bV7>d`COWb$J1LX3G{1;X^>M7ZUiFh76q4zBX9(fl()PH`9P$w3n+N-fMp2P&a zX6GY^IoFGN2I@|xV-i*%kGR```u<;0?}gCe{y;KO^@p&hp8qNex`R`w4u0@YxTFz& z`*>t|-80A|?M|Y8AZ(=n0|U(x)XXfyJF(iVF}It$&HA9M{{d?_Y#zru=-@PJO+UaY z{2aAJPw-Zf>rhj?4K+ibp!P_kQTDu}o~|TpfrY5+#-sMYOzg(*yTufEd%A5%AMOf1 zfIUY0Q??uf)Zaq>61%IY&Gap*HKLhbg*hxtzj_Cx*ou0Z|K+xIZ@AE59x4a}yCn(G`l?Pj3XbU)_d zRn(^IG|&GlI1zaeTm>>Y?hM|IogeZ4{@;uF)JyRo1F1)yU$DTrpW}_YpOn2gbn`W@z??syWa-zBL2Hk*e~FR&{ZK<_36 zT@bg(e}N1}X4Dm878Y5(!hG6XVXi_A^m%NKJIsCNG4q1?8S49A`E}2QKjvQ;i_x4& zHgnB!=4@=m`6XthS!32?BuqdI;H+u|zB#I4vGub^h)n$^F@5bAA6FQQ{4d51iu=l>AV5k+)|PZCxo zc@O?zHQb7)q-xAH1ru=R4JCZ~Ok-PN%*Hr7! zrqjC3ApvrREFgMJo*?C99{D5DH0$`8k1N35L@yZ~zaa0Esj6@+_6dF#^10>5I`iLy z3U5ZYhWwcvCR%qLuaeh;CI3UuybfL$!B_S$WC3{JcwKd?SQrb$YNg~N7 zCFFjhS8T(vpF$pa*&0Thv(3{uio8iCl4(RQs3W8gnL>U=mXJkcI^po#Og>iy%l)t(h~E8rZLTIwh>o2^vp0b}M&2Orkq^i@(r_HGLOeFNawTpc%hW?Gg^uJT zIZnEfhGSAg0n^B4t8d3&lPWToJVI(n!?ByfTVx=4k(?*}$(>{f(Xo^~t|>dE8b?!7 zN`{jGWE~kyHj!hb;rJzm7f6^jti)uJLt54yY4u#=y3&}_-9j?g4$jYSo}SXXUrK6P gAhl0cYTDX0`EftBq-JHL*6qu`5LQ<^e1FRS0Gn3<`v3p{ diff --git a/po/de.po b/po/de.po index d8c5885..929625f 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:06+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index b914bef8ebe26b862f17dd9fe1ffb17a15a09fc9..3760936e8aa828b6db5a4e30caf8030c98204d48 100644 GIT binary patch delta 4657 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 to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -398,7 +398,7 @@ 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:868 +#: src/game.c:606 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -554,32 +554,34 @@ msgstr "Interest rate: " #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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>^} Display stock portfolio" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#. 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^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -591,59 +593,59 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. 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 "Move ^{%lc^}" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "Saving game %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 " Bankruptcy Court " #. 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 has been declared bankrupt by the Interstellar Trading Bank." #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr " New Company " -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" @@ -652,7 +654,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -661,7 +663,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr " Company Merger " @@ -673,7 +675,7 @@ msgstr " Company Merger " #. 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: " @@ -681,7 +683,7 @@ msgstr "Old stock: " #. 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: " @@ -692,7 +694,7 @@ msgstr "New Stock: " #. 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)" @@ -701,7 +703,7 @@ 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 +#: src/move.c:894 #, c-format msgctxt "subtitle" msgid "Total" @@ -711,7 +713,7 @@ msgstr "Total" #. 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" @@ -720,14 +722,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "Old" #. 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" @@ -739,7 +741,7 @@ msgstr "" "^{All assets have been taken to repay outstanding loans.^}" #. 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" @@ -758,7 +760,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: " @@ -768,18 +770,18 @@ msgstr "Amount paid per share: " #. 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 "Old share value: " -#: 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 " Interstellar Trading Bank " -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" @@ -788,7 +790,7 @@ msgstr "" "You were forced to borrow %N\n" "to cover losses from company shares." -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1561,13 +1563,14 @@ msgstr "Page %d of %d" msgid "[ Press to continue ] " msgstr "[ Press to continue ] " -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " @@ -1673,57 +1676,62 @@ msgstr "xwcrtomb: NUL" 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: option ‘%s’ is ambiguous; possibilities:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: 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: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: option ‘%c%s’ doesn't allow an argument\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: option ‘--%s’ requires an argument\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: unrecognized option ‘--%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: unrecognized option ‘%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: invalid option -- ‘%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: option requires an argument -- ‘%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: option ‘-W %s’ is ambiguous\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: option ‘-W %s’ doesn't allow an argument\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: option ‘-W %s’ requires an argument\n" diff --git a/po/en_AU.gmo b/po/en_AU.gmo index 217938e2dfe5e52d77e48481e7df4a210a9a9cf5..c013b37d7e34df76658fae4dce64278b26aa9194 100644 GIT binary patch delta 4657 zcmZA43viBC9>?($AyP?5s0eY12q6-c3(_=_G;xc#gsMwXH0!>!C}lVLvO-nu)}>ZM zRP~}I4QbPMmr|`uvDIoT-9fu_y3-lenN@b$8tm+TfA9J4ZtIL+KF>Mt^PJ~-&Ny~<{&4&$*Ec0*m*y~wq= z(a1kHgFm{Fa#TN+s0-bNt#LmVU_F*|e%F#-cF?c^bzl~kHxNf)XRO4AcnDMQD0aas zsQqIZ4qZ?tcEl1?`y5QfHJFSw*8aJ*U&D5s-?ijuU0Ei^<51KAGf^F_M~%=PREHm< z_P>g$7!em7N|%kQk2Y7J`l-byCDDE z0RDvH6mzOM)0|_@GZ&gm%%#|X#d5P;*;? z8lmx4UyLjpw;Hu3wxUL)2Gj98=3*oV4Zz~IjKA)99SyqEBj(>x9fh()n_?{X!OnO$ zPQ)zSjGgclHo@;v7j_f7VMKdBlD#m2`gqiN%5f!D1=PUmN~E=dF)gGw7N$GS3X8-q zkZE?8P>W9!dWQYF<0Y#9rcqDDrS8t%gFm94mJDuN7m|k>v0>(Pa~W#n1C?y(PWPhj z>@d#d1h+7f`s|*ZlgV0)T&sJY;nIa1!W*<-MlH&3dhsY?cyB+{gHemF9Ch4o9Ec|| zA7dC!?ls^>u#rQKcFtC5eq=|7PvNq zxkepd+s`lRW2k=5qP_uFtljnZPg#rp0l#B14eBrl)!`s>ENbXxpoa8u)QDAC{QzqJ z^QbAiZ2pMqufYI+=h3JO>xvq|zNp81cz_M9#xhh#%TQOk4te{!9awWm z0nvl~NMxW!q7-@OxJOX^R9X8zOr(AebtAWsSA~l$@%o2X)-n*bQ3__0NC4S%z9WPhcp%VD2<`2W9^ESi>9U+va}rU2H%H zhf!f zB3gtAScN*#L0pM{Q=QdSHqyCOjOmKeeib))z(4Qpu@(Du#}q6=eXQoAx+dGXs98H_(vA4@Xf4UPFDYVrKcT)i~@#y%KZqAojrP*ankl z`wk0{*>M%9xvod`cNL2;`q%zrH44?=^}xgaYt{A<-_dN;0jsbBzKrVVnEn2>`7bkW zp1-3^)c&KfD=tD^*ml&5Yd@;rv#9-kLXAYA)qKB04(e+)7PST*MXmZR7>e649d}s! z8S}5^IrB@@8n}p>(x1%63w*tmnT!#7{`;_@1B!fu8*e*I#~9ilGoLiKnl;#*-w&Ce zncvv&*Ucu6`bF0k!`VLtIkC&c7|!qV+0Y%1Fz-h_M&mFHXP_3}!>9vSVic~o`gUwY zy&84FucOw|5p021QTsPqXdfL6q5d1Pk@LH^$VVifsPrViBOj_l=|-5Y;QYO!21*9e zMQu=pvYIR-8p*jt9rX*NK^0$;UCX>iP!lN22 zcbe022>FC)JuD$ApLyI+a}QRM-&(yF{@%7*V>_bvPw;zv)PDFAE+XBD9>+OEFN#g% zAu@%Ok)M~lsC+=4wZTv0l1j43ED}W~ zkpGq&II#5^6g@k(6Ny41J}DIt9}MidoA^-AlRotB=R(DUw`tgMaW ci{k&^lAY7DcioDj+Qu7iltkBcEZNiTKP^T4NdN!< delta 4637 zcmZYBd309A9meqqM2UnYB&(ZX6{XXyf(*DsoJo(Jbd+)q+=gz$^ zhi*qz|0OE;Lwxi$N4Z9l$%%WNYZK+%sK)Ab?szljn&Yb&k5$+bZ(bNfa(GUZ$DUL8FVhh@Hu&r}}3#g>fvCDV3GpG}8VJzM;zeEjKpKob}%}^6dN9N!L zA^+T1{^&xcqsCc!BbbIa zP{)6RnottU(jK!={o}C%F2>Hd&HB$+e+{#r-_M29?z8t5Htf*)dE{5$r?&TQFi zoPzh`c5H}mpeAw=)A3!@N`8x}*r}Z#KOf6z&s3XDbvK~0hBa-(XzW8*&dzFt2a((A zDo~s55?MRn$^9@8dUJKI*)ssHbTw4#r!^ zwYnshHAm0?U@G0|C`E3sdj&P%1ssF-_Vf380&2h|7{)EQp9x<_4Olvm4TUeF#`!Di z_?QR$(sxGgqANgsK0PA$Kd_FSs4F^&+6(WY9+$7|^Y()xZ!9+uHE=QNxDwQPJFqRD zM)sMjLG6Jr@IFlD^0imeP>*E@TLe@ltAfi=_izL17CeU<@PK`O-h9ven;AXC@A^d4 z@fp@GM2-6hrr=_8i&=qzKDbIH6+bf*Sbw#%QJZW$>am(;?PbIPL^8!C$^f3Pg@n#3q()B_u>2TCa&9wGf)PxS8ZrKU* z9BP7>QCD7rn%HNk6>O02C(s7988ZVa8mJI8(_-Xp>*nDQEW;I8g?ll~v!oOMgnF#% z4fmU@5Tj`?L_JN*P><^Y)bZ7*O?emFW6TKOA9SUXMn?g5#s&7lcI&T1olt{XiCWZ3 zBo^{JfH|lyn2G9NjU8}5>O!iJSB3i!dt$;!-_AqM58QGpk#{|I7)GT z6Ho)K$89UY&2@K>QrJ-LBUdf5j!J zr9EO^Mh$cqo8Y&|%hEL&>tE&hm`!^nYK2Z>L%fMi@gvj<{u6^vRN9U6&wC!~i)LUM zmZ{CIiY;<(Eo<6sg5SLr6a8~uh1%uUuq)m{{YbSercV3z_x;mweUkr?`Uqp`Po3;1 zk};Y4uO%Buha7J%KrQ_`)RpeS{&*Z0@&&iC5$%Vk`5&p-s29t#GyFu3p?;)lP@D1H z+5R`>D-6-jnd9FpkIo7Fi96}g<8%rKW7J%~bVD(R_6+Qfdr&W?Y8;BUk=1t@^ZdPD zfttt;4CCvlAE{crpZ1=|{EyTH)Hn&jLVrScOrc{mYSYX|9kAX!Xr4n|(Jj>R-(VMP zx5yt~fO<@)q9(Eub=+>$d1vkOKce0Tfm`ffAj!yzxm;wzZWxAeg!MmRK54Ep*P!;m zI@IRcZ5}hvn$;M~=O3VszvJ71tG~pb*c6-bL5dkN!{&I5=kr-+skzBM-(yx_V~)Fk zF?bdA#kcJ9k5L!+uZRKv{idSFC~7JH*}yo|=4*vIF%vale`^=uJ+vP}O?V<^;yg^i z9jN1vTKi3mqOBjK9z=yF+`UEC^8M~CQE5&zU>SLwsGJ~^$uG!v$V{R#hUi_9P4whc z5f%2CJ4UvVOGITWSw^&aDu+Cgzd>KPKz3N?4{#lMl4$3*Au4%jSM08Y5!@dRkZo^L-Qy}CDmjp(JuWlDJ74Q*NK){ z<+~m?411E{)}Dm#kZIO_!W8*r|9{)8e+G>rQciwF&J*nimA&MZNX`E#wEBGPO-7PO z$R6@0QF)qFlJ%q;(c@S`>IyH^Na1Db+UfqQT=D$h--oQH55|!WdH%0c3NXR zF0uNvW_L^{C&>uwt0M?eJ4jw6ok*BWArBM1V(ZEqRC37+)-lfH1sEy6Q6Pg4@YzjgUwsh5VNMhIA!$rMRwwS!AEJ595!>F0z0uBnL=c zIZox5WH5Q2TqFI-J*0rBtRgFPe=n;=X-F26QDgx52^mUulV6j%GMmbCB*r>6Vi)oN zX-X=O93N^@MVI Rhbm8nk2k2?F!F`;{{Tc%{<{DG diff --git a/po/en_AU.po b/po/en_AU.po index 42e6197..4a992fa 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:06+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" diff --git a/po/en_CA.gmo b/po/en_CA.gmo index bda577420be63c5ac71fcd447ab363eae4892959..aaf4d43da76d8f795af88a8e230f1ad34a2852b1 100644 GIT binary patch delta 4657 zcmZA43s~3H9mny5C{bJ#6cW6E7f=uk6qHaDAvMLjg)47SsiEn@v~;0=ujQ70Q& zHEq)nuvzn3rnsquCUj8B^a4EL=21jWm?a7fa=h}rhHz`WJ&Yg;Jt__~XSiFSs_%*h|a5~kWz@OHb zVeLZH5aY2WmYEe8M|&xDa4z6BQc0rYb>HDWLY?p}MqntT%9f}B+u`k)hPtpp$hEjq zk3+j!XumsgV8$07_?1r`0|B>~7gB|#O7suJUvfkJZN1{$BM-B7>YKH1i1HOkk z{%g#@h_=D0ba|+Dskt0A&R)#K3z&>yoZKC|VL+8JRC?n=?1i|UDzks6{DCQZo>6Kt!)Wv zh9+8j0kUn}D%76Xgqo3B%*Kn@A0s(w2o7t{{OgX_(xE$TFh55P6v`Hj#(3h>m_Hb1|9rMAY|G;!4~cPzSrKGrcRA(;`M=W4e>_&}HqrbSoq8&odN|h)uc4lnUfi}WWB_W$Mwv6rC8(JXR8i5L)}!w1 zIL_e<{(+ISXJzr7EYb$e4 z&%Z(Tn`<@D?|}@wmG(H)UYUfM0V*@7Xe~CFHK;W_hFXF%r~xn9=iiyph5o#*WPm45*{YI>MRnWZK=$VdhNKCVLh&V3oCNtbGvm_`ZXhq06WX zzhQwTphw% zqt36p%Wvui)VSwSzX5--{(qvLvY5dEe_+aBKVTkez#(QSYU-w=rnC|@W7XC^ggX8L zYRQ_+zo9NrZ<*U68g*f*s2S{sx`2@ZD%y=@sDT!vuJn22?d!H;As)m^ypG%PNuDL0 zmvFa#tomRI?Zwy}ccPxA-I$ISP{)T3^P4gmJJAmGr=kz0U@AU^yj$E$*8jHk{}FXU z^l(2DS*V#9g}igz9Mm|~*1sP+)BYHBBiE5vg=%Yf3_L{Gm2h1bbi~-(4 z?S%%^T7F{w)ePmWqYG<`y6_R$7AsIoyBdQtWbOSJ%lEsJRJ18BVg~*hvoT?`|FtSX zmffvF-SJt})HfUB?ToRsi!d7RMP8cjVbm*qGv?rV?1B+v{R`+0478*ppNgh%IBFBk z!(^;RebHfDiJz*??kXGS+|$hI(o(;R!|(UcdwbMwPs4N^g!-|16u+chIK@8|8B_g_ zRsK}gKY|aQphFk33^irz%o_6qYU)2j-RZZeI}3ZjxySf|LX4#S>O=m=>P^%O<`2{S zg|wLNf2^`lo3cl_|7{sn9`IAWmX1t5IF35;E7Y%5%bEVyY65nly%F>AF!sc2n20H} z{D6hX>bPa7wf+D#-W4py=tupJ)i~66*8)HEzgCHl`GLw&C#=9E+<_XX!9Kri-Z0}U z{2gVZj=u-H<2=-bZ9%=b4xq+8k2>xuY9<14bNvB%s9&p6)E=0N+VwADC~m@R+-m*r zn~mnj=0(&V_zbnASIriW`*xg}f)RTDbE)WrLB7M?X9rBf82aa%&zMza4aV~M8|FFl zbNl?789vW%x~x?sU~ldedHO!qwnq| zza}TiYNAJS3n?Iz$-Cqiq%TonuRA8=zonJdUqu`3H8O-~D(@#Mr-|MNqlwl!ov3JI z4I+6&OQ*7yB$2~vP+lQF2-bK<;0t82wO62)=9Io)YsQiU%Q*gyA-9mJN$b+Pe zJVd@G2~l~N>>%68Z^!`B zpDZORx^R`vp5PN>)&HZG)>slo-XpIPl?TXh4bzp%bL3gFfOH}U$t;pVa>z^)MJAE| zlwvC5$ux3+JWW(Kk{<_a{!b#@N`{f!$T4!3+(Vw%ZS1C!Nd}Xf%hsDZYG~g@_T1Ee z{Cn-`)bA$wB+~k~nc`>U=OmtVdxSrgq>wBpi-^h^kL!bvlg`#2g}ca;t^OCdf%+JYLKe4#o a|9bNBv-<8^UR-y}`tM3w?Mo`DOZzvy1^br( delta 4637 zcmZYBd309A9meqqhJ8y|1VVs-B#?waUcwHN-!e)3D@5d_`gEy@|iVvI9Zh<30JWp{>8k78t^{8r4`1aCYFrM!3{?K zxiS3Fg%qL2S&5qHCTxRcn1#o2Ip6Q@QrSgE38U%6c&0ZL`(q-m#AtjOQ}9(x!b_;* zzeP=`Ez8moGf@2#u@f%DF1XG5PgwuQ*pBaacd2M*Z5gF4_C}pB7Bx^YYK69=20Vf~ z{t9-(ug!$kzC8+cehH>w87AO)?27*|;}|5!pd(DBCoV-@@jlcSo;Pn|9PJqX+=r=V z4>QB;YYsFs&9FHXYjJ))vS{vmajd`YVG$j&*xZPk*lz5Mmyk)jJE(iwl4a7$B%<0m z$o6pKP0M1{0Q@~IVbCar^K`Vy3!4F$a2&`)z}0-!@l?>_Qx)4*SCMOV zZCTaPxxMZc)PPku8te4)_xd5!fQvAUn{hW2{s=W-$sjfqmZHY_8|wIa z5BjC=g4{(n6!m#gMDBlJ9nYh#=ylXyxQu#S{%xOk92|LLxk0Fbr=X52MxFN@w!`Dd zK64+V_P{q-ALF@v?Uf|dV;RDh0hIz(a0%)jK8?BsJ5U4evCmJNm(9PM(OG`i$Dxkz zX6+HEai?MjTxf1KD=^Rp7pNrQS7vk8U+rF~O*RqrSQT1(iM3aw9@}lGCEbUb_!;v8 zwxazf)TX?J?Xhl-KQAeV`+q+j1Fd5m>alwaHQ*DdrP_oV;4RdI-naHA_*4}48a0t+ zxqeq~K#ltn#^6!we+TuHUA6X?xq%C#b4nul7cB5SWfO{ffY%PP#1 zs0p4!UHN6y#BQQiuy&rGKr7T{Obw`Lpkb()PD0+cZWdUW`(3MIO9Ye4S&b1G=TK^%`371hTaT~P~ ztw%6>?1%b-B2@oM?1Z~e7gB}1D%_`-jGoRsFlgFb^$h{Js-6fR$({3-)*I$SLfR}2){;dw@V-GuXrhH zY4@4uPy^k-CU_TlS-M7J{Hr_{d(mEjTA@m8fS0f-evVqfuP{iY5VS1D#W$8 zT5Wb!{c+Ac$(klVM34S#&Z|44m~4e4)R z;3tw&!2Q>f4WL7gH|L_3el6-sU%>u&02lBD*RT=o$%Xz$Y6j}XvT?efNIB|9>N09G zUYzNFQ@+6v?S8ZTdu8^lz@PXm9eSLOVkX|h2QYJXx{VsIbiV(QI*l49Hdx?K=!PBW$VY9OIj95HnY+!Cs4KdHI{prJ z#rVhl@k3CL=`_?tR-lgCi8}9uef}BheGq(0C6P+pLci;?kO{jmhH$9$7n{q?z+8pe z18Y&6Yo}Rmo-nJiA)kMOI{vzE2QF%nKd~{!@B7kDdT;M{+x=rOv7b+E}|zxi6CPE17&*w@-aur}?ns0lxeX*dg; z;||pE`>lNpqiE{~sRvQv33tCGPxAflEuzwbXu!4P38HeC6p*820+~TnMiad&dJ#Q2 zXNd~?%)Lgok#j_43t2+6dMYn_B7cLvP(_}z&T05FvVsgCZHP)P;h~6>1N_}@b#a9J zoM?w1Bf7t9$O-ZS(W+|6Pmy1fB$7qy>;13iT%{J#56xVXK;9>diFWBKQbOjF-w-Xc z%EKNv1k=edYd?b3q|n+wHboxU{au^&??z)B*+kwZr-}B1$}aLsq~`yOu=sZNa1Db+Ux$SocH|S-|^Pd2V+PlvW`@cn(`|u&s$?6 zF0%SB%UMIt?uZAE*Z7(S$i6l%OCEq7{#nzNJsN|3rtz)do3ougtz~3?C5SdJh zi2gruhV&#qB#)DylBHxip#<(R{%(lW`JXTLBMnI!=}bnE!Gzxuw~^E(D&<70H;F7G zuabAk2jl{&DaWl6kBzOq8Ml+w8X=BK2l9LJ4oM+3WlBv2Gf0`W_u)^-PBM=yAbUtn zIY{Ls$t2H`i=;oPO@VQf>RHD#*p)m; znv%-$-00}a_gb#2wPk&NeC5X06)91Dwq%FHjeDh~_e%?9B!qen2xV;96mI*!p3s2a Qp~_?719dCc=f9ZzU)K`=6#xJL diff --git a/po/en_CA.po b/po/en_CA.po index d9f3253..69e075b 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:07+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index 55b9e91acae8f915b2c380df569566031fb8ff3e..b85c3ab6295c8f0ce95a7a3106d9cbafff7ddd4c 100644 GIT binary patch delta 4657 zcmZA43w)2)9mnw#AyT<@D;A;h^!QR;Q>Sgdm`@i@le1#FF9U<`)Sss6V7X@MEm zE<_D64x8gtvm9H|uEGw^1>AZniFCZ~J6r?mgfB4yLm5>zM-7;OZ7>yeVS|usaTAb# zZYF1gNv{?)}rqG6Vw-nwexmG{<)$2 z3B{@AbaR$D*DN;|n2XFxY{dCh?U;XN(JiGzYq`PPWgbCY*f~tbD5i&-aJ^A$Ta22a ziPm0-Y#X;6wI?>BW~3H-;d#u*NKP7x!`n0ey5m)J=uQute?$!w$`*~r)|i7S*bgUT zHm=7mcmkW@-%%I#Ev8~bM?aH&F^Tp>)b~{25j6)BJuag zGP_Ht&8G!D!*S_&iRO27>Z!Pt?p%NT2kL3*&28&K2BKzclsUs(jGFmCH5J|IF4UbJ z!u$Dxe_bPB~^G=~Y zzl!WP7gON(KnC7Kdn{_NOv20nl^ImD7VFF!)EXW{Ex~)J0ngj#Uz^c|{=8%}54G#Z zppL&A)n1Gme+?$$HuD$;)N#o=!kOB ztr*!WvGEFQCIp5^7eI`u@K+D3j7AQ;6pr1 zIxqfK|5)|K6xx;87`LLHrfrypAEJ(LG~92>MC?R6(4UGvn2cTVVdUN7wpjmh>;Dt# zgs2gICVHY~q6B&8xVflts;z%FcBcIS>PEgnUKOrIu^(qB@=6J~nN;*aHKyYU)I0xc zOva3n{vBRwK8pIh26f&=OvSho|NQ5hWvIQg6hrYvbF2AkP}aZ3I(C`$<{tA+Y{UQu zP^N}TSphx26f@Z7>^I2mUaaOXUN*SF^=zd?@-aEIENW{8GB*;X#Z<9 z0$FzV1nQ1YqNYA%jJFfU(H?}+cpLK4bkk6;^o^K}4cG;nmHHP@4-7P?qaPJb;c(O@ znvY3XjryW}_&AEa1~7dO4rKko^s-QFG3un_fQH3u)#F1X7-73ov_ zk5#`ZtbYU_ETBUdQiYnb)#eWKFly>QM&0RE)SWdcV|w|50*s_xH_iW8y@h(gd^+7< zNaK6`k5y09rc9gVe_Kjs1^iU6q$86L4x&!Hg8H?Jp6!3FCSVuZ&tV?!!yb4I+hOt? zKVSi}I<5+}*6*Xn`y7if>OTKtRf-z#THwe2*Q)IUexRAC6P92izKj~^kbQp9yl%EC z_ji$N8uW+k|>??Lm#(fI99g)Jz0g&hrQ4pnk2!qxL{KYS*vFP~3pMaI^KF zHqV$JnCDP?;A7O1eq}bE@7pcSWQ@@BpG`$46#5Q#haGSa#?t?wxy*dt+<|d?zTZ4$ z{=q)KW;T7$Z@RV^&hg!lFLqfN%lEr{D!Ri_=2+BYGy%hKI%@OXhdS{wjKXKFy$PGp z-iEs1ov6L^HnzaeQO7r0;M*}6Li=H|mhX43llMpgQOP2Yk$2Ugq!N}ZxPGsygVLMm zqSmNESxy!c&E)+=<+mQUAAd^DTDvO_wtC>zgpYrG?HHF?z9OHoU6Oy93HV@ZN#EPuz4req3vi}0uh zOG|SGjwGjv_QN8g@;i?!F?V7$dBoa%@foYP#STR8pWyHH5&K{dK19-q9>=*vFN$^K zZZefjBR?!XX}m+8x6Z@3k>~|=J2^vC=8-Ikr5gunab1TDYB4sB74akl0mY`Y!XE# zk?%_pm2qS`d4nt?D(lILV9oz&2RD)7q!~F#PLbQlv$~D#R5HmBa$|Y%hK?HAw~*Iv z=s)y>_Px|^C3z&$`d>1|b7V7VO}fqGPX#F?OGqVAS?O^%<9yQD+M{qA`3dxuf#{!XT)Df3&~jRL?6nh% b68_hdo0pYSzoe+P>Dqr5$JBQ$-kJIzv48u$ delta 4637 zcmZYBdwkE=9mnw#jZ2Y=`z1lBTqXF4JC&=X5{4K`J6VOgt*YwMDE+z?9k$5CYP5o` zlQAS%YYbI7T{^~w>bkCb^zpzhy*}Dbhwk32d!BQC-|zXI@A;nZ_nX~+ zi>SRB5&XGD*aqLhX#B+5Blxl<^;W3; zlK4;;gRvP7Hz#6i>NByUbAbyebf#guZ*a#^2fT|-@bBhVs1EPpSK4B8)WDLFF}R_~ zpBv4GPGl;opXI25mSKC`iJ5o|m+<@U4uwh@7So#!jAeNFI1uA;IY#0un1XvT0k5F; zzl$1B4AasD(^2i?uq)2PMBHrc$F2PucI5Zn9SRy*486o)U(^9(P#u+`W~c(y;StpS z?_er^ZpO9q^^vIK7h@Xk#5lZwN%*PRflh*S8geM~#zm+zu0s9b1@jZ^Ks}m|d$7CN z(@Zz}n}f{^Gsn!wdK_PfOq%;v2j*Yba4HS5)ZB;~*e>jbSCB!w+o)^WnrYI^#G~rj z$ntPSsI@Q+H8YDagu8JFUdB9Z$-z3|NwLho&U6C}av!RrxA8vw3--s4aUdqLWc%Qw zct2KPV?2r)$Qew=KcZ&x8;ryFPQL#k2q>&#PMgvj>(G_4vYO({$Ypia zs73b{UShv5@CNmBH0o}s?#?ZSCsB9HZPY*-ar&CEc4o*dKuvuK>O_N53Ocj(IENoN zi%qHb?Zw%0v9ggdx>?MZ2C@#nru`6VG4Ai{ToztLO?9h&e$nNjj+>9Vo60c*-$l;V z#W1adbpK~i=t09`bs1D!2QP^OBzt-bX9X^FQxCwVL;LE5E7Y|`U;ftt#{)yVZ z(F1%MC$wJPEa5DeAZvup=Hr z)|tD8S_5C=y%@{sYpo=pZp#q14k#3>fD2I9@cXDsum#oOZu|aq^Q!rg8JX!bBjCn$jxNz|WW$ zu`TuYQH$~`?1T-o{c#D|T>myS47P?M)NMB%)!{ms<;sDUiX z^{aY4s^6C|8jo1}o2a|&n$~DqFfz{%pbcsEeo)c&=oMR^muVEy5~JxHXGKtnDj;%xh(+}aPI4!DAviCd_d zXj{O00Q;kUpaj*v47=hE)QOx%9u@9A?1j;VzMh2~AGrAx^sL{3-S7{{GsxXC6Gr&& z$D%q~gUNUlb>DwzHX7;IOe*qNaQSATIm#SsP6*5Of7lv|%@V9f2h&k&U>52cE;Bcq zRj7fVKn?tJY=`Z53h9!DP&1Qd^~uX*UQ#V5@oyXT>)-Kr!==goCG`O|p}k|V zA4qaB*I!dMkOo;~&PGlBD%6>7#eujF=kf#Bu_^V3O8iS|8tTEaVVWPvUertK3TiQ4 zoZ;UoUtoxO|C#=|GIM6&58Oh7Zl@!dfp_tK96BrfmU2_D2lef!2U9I(;dNy8UGi*y ztxHh@slXgOjCx7kLiM-(3ICEhh3Y3dnClPdj-6>JKrNbCs2$drJI&*$GrEe}|KFH| zF;Dvab5XZxF=`-7QTuH}9e2#We;@Tc2<}jbr_g?$U-cQtfL%6*FwfebHlHz{HJ78- zz$(<@+Gg%GkD0aDgzx`^+W&^H2fWbzflaYFU&NX{%uKTgTk!o|JH;Fn?f{jVwLHoA)qFlxSEe63Iirl30PXZ2jHPkl6Mz~eCuXJAXL zK1x?V^G4f29Deizq}XUQPao@mP@+!W#M7kvKQ%Hjz5 z0nrM7jfB?&9w$E`npI8tN%Aw2Kr+d_dj9J^*H(|{Me{upN6wS^M5}ZKSxlZFuM$nO zwh10L4119Wtv(swCM8yX#uRyE*MIBGe=3zCQbtaZ*NN7Hwo0-mT=E|UR(>4&l0xzb z*+G6qw5=mGIl-qvTJw%=+ zd&xQSdvcM~ZO5z-i&0kIgcW3^dgwr*Gx;s~4M`z&+oZYzrjwmkufnBdJDEe~lHH_k zJ3!&rB!m2zTp|NWeUeYKEhkHKeQQ-?YfR>m5o9p=5y>JikvB=*HiN8b0Z^bYFn?ZSH89|wq|3y>Xe9nS4M+>6$Ax+i3Z<8q<;482B{ZmS Q@0!\n" "Language-Team: English (British)\n" diff --git a/po/en_US.gmo b/po/en_US.gmo index b063989d25810564d63a0a6e309c619368b30d66..36d07a88eb41f76997c1803220c4c46a54e52e78 100644 GIT binary patch delta 4657 zcmZA33w)2)9mnw#Ar-k0mk@CY66B@{iKKChqy(wDZRy;r<`SwCN@-(%7EDVUk(x!T zYG$iSBx+jiY(}+cTvuM(Y_o2**T`O5*7ns^wR>%!@BjR^bj3~7_cP7TUj(8T^<8_S153wD#rcv#2{ON#c zR?kOuF$LS=9J35NQD2AMoeQ`f9Q35&h;MLLQ5SrS5g1CZvMs8^cEa&@OCwkdK!#31~Sq!fTCt(uSU`srXDR>I|Vl(Re zSf)b*8ic*D7}dT6d*d_M59_S`s&;WBf&B^-F^cKoCfq>O+7_c` zXu8!`A=}1nLhXqcP%~18nRpF{Vk8%h#`n>SD$g|bDXF&1+$3Gc(1 zn1wsA51zv|_;=L6KF4H?=;3EF8xyEcM}1E@Zon4v)MMm-fbQ=J=v|3E!01G#MtWH@TZ9yAx2Yf&>FsNq0&T93N3 zllT~4@C8OvU!1{rvRJE-vAUO;E)C>3-l4q-wJHCU&7+8|2m7fWhuU=IsOw(EB0P&D zFox;mUIT6t2YEECzya8REVug|s>3@t0f*-Lwcdj2a6cB}8QjZ&BN;s%x`v_LEnY$O z(`T4Je>iIDXCkZX)}Z#E+ZjCI1!P`A-O*oA7eo*DkIMj5hYw+QT!uYxE9$&@)O8n8 zpMQkxH`i{2-venFPJJ?Jugt*o00#>=&{}La51`iY1ZoM+qdL51pWim4^Zj*+W*%zS zPeh&n2&%po)&Dl^iLaPvFrbE;*3g>yPN3f39BVE@ZL-a%4r{D_!0K6nnp*CeY_P}8U%)c(2K|?H-q3WAZkKHa*hqb89bQ;ycC#V6nVgsn&0Rthd zHR}4k_xnwK6xDAd>NnsI*8VZ-DGM7F@F#X1)%#3Kw4N`x%P7QUY!k2l}8AQ}HC~o&PsX z#NH41cX*NcIO_8~sOzp`GPWM?pZ|eo32N^=iJ`dNtTA^5W&QV9!#;DrS!W)?7Ibg~ zwHJ<}HrWO9hItz`uqfU>8u&=;g7Z;J8^GWUS-lq9^Zo7^2ig=DF%5r@nHW96|61iE z%kI{o?)VgH>OVC*PxPBO2cu~phrBf1RMacI3bU{g`=FcTUqFc%XiNQG4m5=$P@AX} z6R;BXMGd$CFR9M%Dw*uuM&@*7iQmQloa&$Vm}!2u_rMg+AB_63nuAT$vuF9IB4M`w zu^KR&^^f3#MKow2D^XLn(cEnwMNR!>Y>$6N-Ps*n$`@ok><6%KuK%%m4fTS#HqQ^_ zGt`e&;(Wg;dzSj&mV(lNpX&8Aq;tXRs0;sy`n3vOVK?8qxx$Ke8c}*MKARo%|uv=U2>TvrU=5 zqa@V%W3WFiL=CJ8_2Q~U_4^*`yj!TpGZ4PapOA)nF^og)f%&LizXe0F5;L*d+TStH zn2qKI)EnM<(DFr0?kd~;A2K7s16!s=Dniux|p zfcK*I(h=-{H&Ew)YV}qtoa493JxQwhes_eNCnJbT2Kg3gRE3gESgzpu{ZI{*fkcDa zrV3>fSxYpNj}evkJnk4iPp(*9ulWKy4t$@3daL{lH;}hT1JQb`%pyCez zrK7n3A0U^A_QPtT@^g*m_FN*Et z5i*C&C0{Q0QhAqr*Bal(7l>X^50UqY$}%!2c*K8b@G=SLk@y}-AbN2W6P2%%y<`u0 zhYTk}$vUEahBT?Bwo(>-QKV2c5j3sTz338Eqg*>O**v~;a8Aa|cyYFf^K>dDF zdsq9(FV*LBJci_vNNa!D6yG5)kyz4iA%DtAKB*vUh)Si$4aVi9x78oSSI84&D%nSh z$ZJG>4IwJs$noHj|C4mME~YZ9y17gA;j}K-Q$lj8BMJ+nvePqi(=&4uGVaUE%Br4T c82`VP+`NpO!xe>l@2UQ4al6AEi|dmA4cZR-)&Kwi delta 4629 zcmZYBe_U799mny5`CC!&M=2oU5Bv!x0wN%yq7owW$Fzdwuc4(*&HRDl%sVaHoTdW@ z%vzbhvP_qPve9&=Q!6LSbn{o4`(t~oY)hvP=N_%vUhnVu(Eiwc@cur}Ip2HF_ug~Q zxtFas!j69$7JS^UafM^MKw`+Drp|Q^b8cL?TAe!(>0Adqi0$w+-j7!>0&iJ+7+qvk*H{pNn0b3tT{p6(C)O7^ z2R97)a})T`h0H?rvj%mdW!M>a;BY*GtN4BQ6@~3ItfV&`7{lr1Vmij-8f=VvupjQj zUU&($|JSG!ie^~4VKSUx|sh1LN=<_Q8LcQFIa{(~v`95H3eu@m|yqo-=P@6!i!` z?!*4(gJ!asW@eh%W{#PQjW|9Z88r8;D8^s+a25@+)ZBzRv7OixFCi!GzC_*AjtrAV zCLUEEiA)bS2{jjHqef;qCgCm|iWhMVw&!47a8V57uPc3?2Du;AQ9ZW7KVcf)#B}V< zluf~z*aIuECBB6^kyF?g|A-pN|6m-($NK)q;5zD$tInkQTR`Di#K^?agwVJkI zHhzd)tBYn>GqnD*DGZ=tC31V+>!=P-;&^O2#NX?OQ5`P994yD3obW|dhbxCNq3~r? zKYvH<-#p6?eQ)G0x?I%vvqEzJ18aBzbw!6!bKx>-x%|t%?=~#-#BxJX9T%bYD@7f* z6}#XOWS+UJs5$UYY=JRczUE3V)Ur&%jsb<~D&R8IJ=}o01y!gHciHzR%**EIX5-<0 z)<>cCPq6w}RKJg5S6pnCo7EWTi}MuX@V42W@mDrlQAx!ppLRoXIg+fZQV2+jw^5#*5P&>%v#bc zzKmK{cln6NtcUzdsu;DJ=Af2q6>9$zs7ZMpyWzjBJ?N6>-)0%un=fXf4p?vPuc8j9 zM~%cy)JTMnZNoAQM%+Y3^SrC%@KhYYdn1$Ggj;5mKzzozq zEHO8jub@u+FzUoV#ZK6Ur;u)GZ`8=7S$#6Lqdp5Y7nWlJzwg#l(4(^!hvFy5?RN3w z{T0tg4ed7b7^LRwH zz1?(wBC*rC{~EFZG{{_Y25RU_QCGSd({Tqb;s-v$*3=7%{Y$C{^mG)Jy6t zYBIhv$G=l`Fs6YSK(c?Xb$MGOJNnRFB&K z7WTo2r~LlusAW1Cbs~#V`<0=NJ80kk0rflxZc~V-&}Olp^(n{+yEII~Olx0YE;5&x zC8#-2ike(y=63U-c^q5u{RgQ1ulai5?%EDvOZ>8kG<%q-W-hklz(RAr8QAyb<}M6p zzgldLCs99KZ{J@*UEpUS10FOKw2baxQ*5-~HmSY(jlBMq)lD;#6#p z8&Laiv-*AvqplaygG3uE-2Ik3$M3siL|X@<4%d+qqU{iwPJT%ylgEj+@kGyx6rz=L znrLI5xi?7#IYYE9%Sj*=INMpZ-pHhGQoBEv}wJ^!`NwKXDo(aa}t?p38ML+Z992ARPrBVt-JtJNj`au zyh46Ww5=yK| zvxxqmI7J4L?~m03DCgtQ`wq$epL!wByZw}~_(+V&HT-lJp% z*+^IaZQq)I$`7uH<**UDA&!YTT8N-j3b%kr(^`#M&2O}+Z+m2q`5V0#6Bd8 zw5>T6xw+|<)%h_sn>tnZ3md#;L{3h4O5(sFiAl+ENrN(ylDCxQME|cPDI;}IO\n" "Language-Team: English\n" diff --git a/po/eo.gmo b/po/eo.gmo index 37202e7c837a00589647161dac88b0c4dc25b19a..556f0893240414b0cca2f2e9e12c6cf9c4871a9c 100644 GIT binary patch delta 4657 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\n" "Language-Team: Esperanto \n" diff --git a/po/fi.gmo b/po/fi.gmo index ab6925bad7fbf9c16bfb5ced965e3b2df64b20cd..2a98dbf78a9c52933329a0677e91582a378cd945 100644 GIT binary patch delta 4657 zcmZA33v|!t9mnw}LYn3x3E~!)$VJ>@AqkO^gb^WD~Yj?e$~d!GOA_xnG;=kkj` z-v~MRRY>4Uv&NeprJl4SN5Y&-2yt#gv|61z9p_vNJcG^f3bw@S7>nUFs=W;#&9R5o z3sAQhgE2VSoQLt$mt%Y90&WWj9cg&mH@J^c7kq`07|LB`4C;mn*b2L%IyMmLiyMdh zb2ItSgDgSarwY~4J=g{hVFA|T5`N#sbC*|X*oe9?i|!4@QcT4vY>Y>-8=k<xnnepeKFL{2X9m_75m{t z%)%|0jOQ={|AFe*UF?dH9sEdUV_IM9>Upq}hF z&fy2X#whAfWbm6z)*_^@?iGeh9XX13X#WDWD6eL-6*0VzAL?PKMYjZX-Ci7uXD}b* z7*3uw;7U2jrC}lV#9Cy!-KVG<-ocUBKgZAYI@AsKU?HByopd;g-g84&+n=Y!denWA z2l(^zP(wcvnO(OOwf@}J-~lfn^8)ILzC>NnG|z9Bo~Rp+$M!fMJKzS?c{Ql(K16+g z16gk_Hs7y-9{3>j(WtdD0n-B<%-}$CvDw^*n!{tLDfj?&!^`&lZL?{Czb?hhMXmZ# zsPm_w>dR2~--sP?w|N=^YG|;AaK<~4dKa_UoQ+y!Yf(3>vid%&A4F~6_faGC8LH!V z&G12f5yztzWjc1i0fQKST{wY;mN*YpUxV6qFQaa_AGMfHp>A*!)uARV0M(o0{t)IG zwRR>IZ<0k?fq;gP?y5NqT5XoNA4|PPE+(2B7Yw$3} zKJ16^9FC^`C9)G;Ua|jUH4l4He+qdexZRkD_1GD2q8=>JZkT_y7NEA@G}MKgP#rjl zxKQyd9MJziSQuGDAlC3mTgb zm=UN&6pgL0vzcd(Lv?r#rr-|L`6n<2|A>0={N3siqgZqNzH7^Y7Ed~M!F<$Q&P1l$ zZ9}ecpIduosh`W~=4#a9-HlE0FltK9qW&g?vOsb%AJwtN7=b%5pq}luFAkyR>{HbK zY%<2L`V?GGeGqnO?A#@+3}xiT`|Y~E%>VE%)R5O<2A;<>&cBCusi#fy?}g;a&aqxy z#$@I{ih~LoV(}S_!!5WL_ux9rp2Et<){PlPI7!ApI%WOM`r=^~UyvE&f)X=?)g?JUU__{vn zuX`K^Q(u7$o;!`|Xu@3Ifj-Efxrw-yj=YH)>EVF|es1TZ7S(ao4_(Ftyk{mX^e?Ku zs25Qw>ij1$4Oe3)tU>Lfi}wB3sBPKeDQ}iJ)(kALgH5O#A3*i&5;BtRHiqF{?2C<_ z_U*am0JFd>L_K*C#^Pkul+L&MN^>(d)Bb;r16^>?H@JE`;jgF*Z<`T|e7&976PxpW z0dgZZ)|_GAFE-a2XH?|;sK23_uac3G^XLV*aSbp82l6Jg6kNM|3qCFQ{lf) zKy{!yK8X3Kjuc}iPO$GcpgOS2>Th8P^~I!8`~Pk70m&yS8RW<0eN`x3$vmPh`8rYQ zP1LE4s!+5$mXTJ3wHYjD%_F#p)LUI|NiA-bz%D*&f`^O*t|Es>E$Ky69wS@HJEV@R zCgaGXp3Y)^Qp8s1|A9{YjpblUW(G+}_sGK3K$w;E1 z)yh`U^b909gxwS@8~E%<4*ROxi{G~6x%fQ!k=0kCrtY+UUyE#^eK8tG5zYJK6b|%`UrQE|PUIkYg7hF+ zWHyN=6Ucu`AqQi~H1aF*3{lxao(&%PkG7!gSxh3xG4df9OMa@y*uz0O8A9$aJML@P zM}08ae_#9YZ`7xA{4mKSQP%#7DPADkNlTJ8laD2&fUF=(iOPD9>w`ZaNmhRZcax{d zcgWAlQ1TYhy&fVe?a0yKk^e}otBzYAR(Y*;)4Cq5uXGFPTNznc7@eJ-k(1slCo!X6 hZdO)hSz*HeT5@tTa_UwT{w=&RXGF8QF~eih{|&IQ0WSam delta 4625 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 diff --git a/po/fi.po b/po/fi.po index ab7efe1..8f05107 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:08+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.gmo b/po/fr.gmo index c393df60bd8715d0ac05e47d3c0325fa21b9259a..ab64fee8802ef70525bb90753d803f9e399f1c63 100644 GIT binary patch delta 4657 zcmZA23tX1f0mtz}7{lO2KtT`{C)4@aEc`$l;{hzdGg!;_n+QhPM#l!!iJ45V1Set=Hem-mg#EA`d*e0K@sTWt zCNv0p;aF7vGK|LuF&SH2|5?|69eeQoCW5myvq2bx<4`9oMh)~BYK8Wo20V#6{&P&h zpeWx`nru|N+_?rd&R$H#zhE2&aB?3^Mz1Ops0_lDn1L;*E5C^P;(%_}-pHRB#fLx6 zb>8V*>|Exobgpo&bk^ZboL}FK^=B2$S~_$uo1LxBcGSeqVIq219xlRUpziHh)C$dT z?HXj;n02T}>>*>&yzUllJHIP4BGz24Y2qxiBoQ0XV z2@~)H-h!W@CiV^X#h{*cC9^P&_6*eb)Z+cP#j6f>S3JFIS<@m$V`G{l?66>bAGyuu zGHUbbhQ7;j{qZu*|In$Y;&OjuhT*?ZPfG@ut%>BLR&2a;k#jX_<-JW*bfvARD?5zK z`GRjTnD){%zLT3(gUr=zWw|twL-;lQe?x7`PqKIvF>tV5>M^KISBpAt7na~L9FAcu zC)esV6RG6Tu>uF+UgUP04^abtjb)gdZSVENr~!9kF&@S3OgNa?Goaa<%hlo;)Hn%w z_V|3%($7NfuBk)qKhx~1@B(t4MqSZW)CnQ^_Hh}28gMH1z$)yC>ruzGqRu;o`u}xg zznReCb`PXrN7|E6du1l3dZ{d;qI0 zGqA{R;t15HOvRp%>$d4~D5mo;cHreen_|W9S(BBj(Mf(uHJ4u=5|NH(fWDB@fF{6L=hTOWtx`MJ;hynfVO1tkQw}(&@nudwE33dEI)U7>>ari0f76(qIpYJ!(RP=oI#|$jQ z0=yg924+8U(dJv!kItAW_R74@W(?7B7>?~&i0`4!i@we7kwrL=_CC}EK0>dD%5^GQ zVpDE!K?=svoQk@qHCTtu__{w=HI?^1o||s3uzj|@!Vgd{o@=P*+cSsF$8jlmmG=C3 zcA{nT`Jtmddp`F+h{`rPI$;ayad{PE@f_ZcUm+J`CM~c}#WTpyf@#OU`m-_^tm7-# zH{6;_sJ&CR)b9Ff%;&hRsEK{JoF@gpU(WjLSFhw}c6Zie0_`^BHktQu0`|Mh-qTg6 znQujH!jDmpQ*5O@t^}Ejc>?3{J50p5DsCH&#EVR1J?e3+^j6y|+l*Se&rkz~++!V# z8fZ4gVLj@~o<<#i4Ey1ysOLYt#ySl3{{^Vy??XKuJ5evNQ>c~jUU8Mcm3C>9Q3sAd zCTf;Am!qz@3Rz*Z$GOk>yz@oWV|M^M<5}kw45$4acEQklegF5GBq};#sO>OQPzP4H z_9|xs>cs7?{Ss=|pFnNm_puXRasU4c!)SX}*{3TOwb!zoh3L`m|2QgoG0eaYIM*Gp z5Pw3u3Uwv-y8cH|U(}5Hf?cTd52B7cjDzvd7=fNzJHZ50J01Oy`I$z(-|Q#vkl{on zjoe3$t3mN?6x98CMjez4qQN$(L0Lyuldgo#?JIw99>mAV8Q0c+C~|f0Z>hAp#_M=L zIY9Q3bfPkwG?Ujz8~GI}C%2Io$Pw}&8A_fcd1MwjL4Hq$5EULKbGNT%KSK5XSJ8%g zo{S<|%IQSq7>OcfM0-LzT}8`ZNV17Gsmgj1OI}ffvWwjAtMRLekC9)v_FB}fI;!v2 zJzU}bF$pIS-S;`>*8rZQv_ed_Lmp(b$75 z*7a-CwG)*W39kU(>o^9N5xtN$l6hnsA5W7wq8G?mqOyQ&C)>zdB%kDxdZMCCB#E!k{?PjmC58z@)G$aQQ1Tu@YU=`H|R)8$t~m!a*9kL zkLogZQb{Ev$&KZy8#;E=9zmYHq5trY+6$?VCOIV7^>1~GUz6XENRnK^M=dEJYe*eY zX|VWSBtNGf@7m*W2f2q#BfldhR0_bJDWg))aT?*tl?9SlilL7Z3a|Uj_sQ delta 4625 zcmZYBd019e0>|+Kk}D_(Dgx?@3W!U}s)EZ4Z$fT~dtj?jDNR}w8K`r|F{hl#7&OeB z%1J2878T4kOI}zGl0bI0H>P)pF;gPcYRvX1V`6XzcE|nL6TierJm=a&_+vEn7}R-# z_|PqKu^Ucw7Gn?U3$c$ep7AL3qv09bVD_LcIEh{GjPnBOhVA&4UKoYySSr#7GYyI7(0bGjccISz z5{KeXPG798Peol{jl*y=`mhBD;g8NZZsKLo5TKBbOHfa|74?NJ&T|+?J(7=hIK(;J znc*Di%yo`;2AqW$%Jq|xK{GeRG5(svG8$x+^Kn$i>Tw_*M>=gTqvo^+!=#Z(Le=w; zNy?XiQhq~W=zG;Q6u>?`Y@@ly?+6&qJF39EUNE43J)`;;oOaNXlhwm;rKiyR z=sv-toOd3-rG9`$?S{r7Y%$!2+AWt+9qGv9Ys6xmY0gQgp)W-}s8>ZnPxcrt;tTd; zIQ6U%JS~%zkMz-$GhXV*YP>}IPSj%DmSs#HwxWhQCfhE$0@QU6pmx(b9FHfFXEpH* zYmWB+cna6jP>oElc?osH4{;i{A7$ry4(f*YV*uA;Jsm!Vx?%Mg78E{&EfA*Q}86}h7IoT?>oP6{@@Jr+f^TjI)A9E zPeR@IChUh5&b7`)^z?^T3O@XYGn(;NJrlLaW}~)MsjFAI`byNctwRmzR#eBEovql5 z`d6q$c>()khkScoaz69llZIT^Fax#i?n2%0LDW#yqHeGk)uAJ<{wJ&nVXjfgYYF`#$PX&=Coma9C)pn>FO`CZc(St!^#xmSI37e@_-|B? z2TZmW;0WpqF%dW7P~44r5Bv>vUHlYV51?LDm9D-62W$U-LxFdR={nW+EDwiJU*LQK zgKs!wCz{KsFV10jG!=I{Yf(e{2J%`kt#}O{bDnbk)%k5u=KlxR@K5I@4CO+-eKdFN zu#tuY)S@{u-Fh0;p`URej-6r8pN~=0m!c2Xpr-aU*S;6EWc{3B>dBI3S^e0R`aJB8<;c!5%Td?uMW)$A%(hcF7uA7BFakHAM)(Evm;=*F z!G~8+bJ=$eH$y+}V=Ujr@6ao;Pgs77eZrNf7fu~&UpHYk=e6P)>Ye7>j-JPS>S3k! z1y_jOsLw2A{C=@T|KM%MZi?9VXr-}F4o)@4N;cC>X zZpI=!i}b~eyU*^5den9Mkqu+c;Ma5{yTW#?*Ms)K@=znU-lL!!?sT5Q{?x;k*eOXt zJ=yiB3l^iMYz=DPzv=vo`+Mhy?D>OGyJH&a#Z`$Ki5ll?sFC#!QP7FsAssc5Rn{2P z6UQPWY-Ty!GvHK@f|k1@E*wI4*C|COzK<`M;+*tOc;AkmqHx^SYa z--2586{uCb0=0;0+}}506!j+Tfz8+jPdZPduKNk~UI;& z&qRHZAN2)As2j{jowoq9aT)51n^0eLz}1gq2=$(1IMHzf`GEXJ`+qOdp{LastRgIf z;IWg>Tge+_7P*t?m`28sOcG1>6CEsgvyIe|Pl%3nq>^Zqb!@Q&KfRIgA$iI*-iD8m zUy>Zso9MWXEDV--li|y*EOwC^qMh^>=|vtUd&nP1d!n_qkGx2diJx?0{RM}Na&VF9 zTBS**sB%b`5Fl}Zrd6Q_^b22N3?bUKtnsTym@Cb}zM6j> zEtdcLoatJ!F_QErkCH~xcDz7gqpQru`(63>&TBE1yiO*%wl=&pO3#yLNfHT=+sQnl zS8UtyHidlhv}>5|EO#EpBC>-NlQNWl5yl_@;K>0bi7J5dN-1X$SdRk`HZxZwqv&|Bw&Oquf_FbrS1?%p&vO&J|=@n z+fmY1zznk4)wkku@(fu-?j;SR?buG?T{50*AV` bjCHkv`2V$}\n" "Language-Team: French \n" diff --git a/po/hr.gmo b/po/hr.gmo index 42926666bae73002938ff80e83f2757c98ebdc56..db07cd349864fa8103fdde97ffbd9353ad1ac0c6 100644 GIT binary patch delta 4657 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 gUvkQT\n" "Language-Team: Croatian \n" diff --git a/po/hu.gmo b/po/hu.gmo new file mode 100644 index 0000000000000000000000000000000000000000..a6f38345a2eac7cafba64be9c41389c34464be09 GIT binary patch literal 32438 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 literal 0 HcmV?d00001 diff --git a/po/hu.po b/po/hu.po index dc9a3aa..15be0d9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:09+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" diff --git a/po/nb.gmo b/po/nb.gmo index c4bb8b3f19d75133565444e934a707d353af00d3..8456ad4d177753dda594c8a44b74bdce60246f55 100644 GIT binary patch delta 4657 zcmZA32~<_b0mktm7z9}q5X6N=#SKA`MS&n%P^{nvwwhE_+yjacjfxHSxtFL_BQ+MI z)fj8th$N6EF{Z|ZMAXDAY8%rYLYw0`HnzuRu_s6E^8emU)6{$T-fw2OckaEjJlJ&8 z=Z`miJgs5vb{UQ0M)gyNdeEcT6;I(vyn@x--$c;Mvo!2PU6{t>jlm-9gLT*r&tL*JV_&?5IzN)( z&;zAnPb@^WS70yPjQz0QwO@7ZUt%=(HxXQ|CricdI39ID8LFeFP$Tp_s>4gD^S{7E z42<#)rO80mr#RQ6`f0!<{21fVkBj?bKlG?Di9#x_!W67Wy?Gnz#(v$beUTrN&xbG0 za?W#>IV+r%&gITk&eiw;*RSoy_%n)T0}YzXJSfYcm_2h^*97S!E6lTqI?|NgYnlJ@1Q|%`j+!ER7bun(GZNpVb}*VaXO~q zZtRWkVh8*?>cQ^f01S+=BbknI)Tg2DQ;i#OuSX56u3ofmU`%uAjfH8>vBHAz56Co| z8>q#n3BAmD1Mvpcf77U4abut{58*#hyCsF!)`R4rMr?v}fpZONbmz)zyA_h zZ>G}-y9N?5fO;`%t(0Jrhr$91nu}e|P#u2ae*cX#WTd?=-kF73^^;KN z&qmePp!(m5v3SJUf*v*8a1H*9cO3Qp&auvN)FRu0>afn$kGuM-sO@_ZH9~Eu2fyp| z&$Wv<0<|cUFb0R`GXA=-goa40MAd6h+ioAK!xN~*bPmEL+z^DsF4U5ZH*o6v4wORbYh|VMX9T=KwY>6<8VLfLEk_vqTiz)^lQ|4 zzWMfnx}YAUA8INxFbbz&7(Rx&-#QNkb+jAxCQYazZbn`BJ50l`u^I=khqmHj)Ptmc z-x%&~3Q%7-JFp#|LXFrNjK{xW9EOdxBbtip-!s7#7GWP6Hlr?VK+RDr_Qijq)=GSV zUDczUr8t20YSix!V=sIMb>qLFc0ov??Kc5+-orRh`@f2U_WdE`OU+z%^}DE!62{r> zH{Q7dhtR$sb>k0F=iNpAUYVHj)(q6zDaHq|!nwq`%q#Q1!ZoaNRy#e;bM*=b5OfEk;fCYz#pUhI4I+HRo5TMHM{Bb{vO8sSifJ9L;>^e$*6yj2-Y_=;=rypvVq!SJVx1QFC98 zn)@el3pSwsSY;R6KUO7E?5h9MBX&F9Mh&^|kL-)Y;M=~&jKk}+ht04L_zmVzZ$Fdy z52BDi({7i^s3D$<8meksjCHsW{Y&i)A4k1e4W8fzXHoqup393c*-v0B^+WUR8#iMp z=Y5V^EBDIm|A4XO9y@2H<@O(i?Whw@BVS(TQyhUkxx2Q@EKETU4#XE-dn@KszlRKh z$y;R4--jB}*RTLT!<9V9pbGoH;$hDcwgSIsL485=thD?EiR!kr6eisO>h? z)k~doob#P!sKvPm_28RO54_jao17OgMEk#ug5La=Z7}|i+Y7s3C)$&oInIgBQViwy zl^BNWUHxg)qCVp4uOK%v7tjx{VIa0)IQKVyrJy%7%k2ri7)-STw#O*!jByx*>8K8K zUA+j^@eI@h&BGL2>FUQ&{hfC83+O}r$E23~o0rIYL<>zvGFeA1s=}dRXIi~m^4DtM z&^Vf?q^rDv8_6lsK!y+~9aISMP6!zX|ingM{x3?{S__t&NF9 zbDThQXnwUlGYGrMd+gvdmb_-G<`_Qg%1iJm@)K9zfZ?P?_t%^;CElZ$&q+k{K9jso z*s|WEvvUECBOeegq*X-6M;7l_wTjP^I`V`n9O>j|-jdxR(Ui;d{_RM!`^C$+f(#`3 zvspoUlU-ysnMLN1?;eAxyhDEB8sEZa$RIM6TqZh}l2mVr?-l%zc>MV|Na9F;Qb=^n zCC`y($=gKV*V$w((V+*|vDf0=5w7@u)Ke=We&iB)f#@hD1?ncA!d9|{RFR(KRkDyI zk~C6If=LPa?~zAgGMPtSA)APf-Q-Dc$$oT$05X;Au%jI89$#`Srxx39fj*s*bN;nalx073Kn5&!@I delta 4625 zcmZYBdtBGm9mny5nHqwEfFgMLc>x7Q1-zjqDh`GssZ*C^n29!RbB35f);H5y-b0gS zn|U{Lx)Ll`^HL^WXF1(cyR3G7w1-xG;`!}srb&iQ@6=Xbv6obMMu zxEk@~)rjCXZJKUy92ZFka-f-W?IWBkidL(0FUL9;kNdF=p1`(v1!M5KwMXz}9QAnA zc|G}17elc%7MfErf%+Wm=v?3e3Y}@#!)CKQjOT22{Ky`QvztRq4Q3Fdu#^8n{ z|J-;!bR%V`ewLsHT8-^-8;-z3xR~E}4HUN0P(^RLumi&@z#L4$CD;^Sz;xV;sdx!> z{=ZQJN@iNRU^c3KGIqss?13As{jjyahaLHS*FZrdOQx4(9DurD0;;1*)C|?2I(!v% z{uS(vUz(vrUmu6Mz6vvN8;0;a_QWsDBsvMQX~?6Hg^N&kya)Az=gsSwL_LO&TdA?K!PFK?)_n|sEhpq5q9E6`^4)$Qn_Qx66 z4QntGUq=n39@FsGsG0m4LzvRZ_n(hXP@kcgtdpLdNLkGG7|Va{MRl2T+^wr2)>3#0#jYjvweZT|Vl%3e?lI9&_=1g@Ye=dbSG*ltW>s~~4cpUG*W`q4&PeFCK0P}DiZfC&nqB^V^#)iV@QT=?1I={v3 ze(HN5tLO?)-t&IHham>H!{ZX52GU~CKY4wFxUy6EcH=w3;4{G4`<^^m= z{Ug+-yn&st`6z!~>L}K~Ee%7hVIu0WyARdjgQ%&hMs;u$HK2E_{vmFOV68ER_BEsZ z6mLciY!B+GI*OW!i{_uruSW;|#Ds776Vg!^jzC>F8ACV+HP98PO|%s?&?Bhx&Y=eQ zThu_lKrKa+eE%4RP>)*-Z?i9I_hzA{e2h86d^4~M+`!NcyV+=Nwvi_Rl zR@41drQ$s5d3Zn8qNc3VJ^qfea4$b_KdPg|GVX-MPQlL9i)Z^go`-DJ|9_A(H}EISrh%7}TaLMS7WJ64WEA|Nb7|NMr=i-P!hGC?+^qZ5+6%tx zmuwb}p?x(jVj!2X3-$5yox2muQG4ZVKp{lo52(#@>jVBp)D^><1vNuOW*KV97NhQL zht*G_I{X|%*rMDIG!38gRbVOU(+@W?g|A=tf@;T&hPM?|Ap$f#X>)z z)|f@Ti`6Hg`kQU_3XGtxW#~(E6qC2ell;CrN_51NSn>pUkmxu-rjvtY5@AD!4<7aK z|7iQ8rt?I&)ju^aQQkn#SlfDJ4B=T*(+m2rBN#;CIN4|o_uvo6qhtut+UgihczVLe zPx<_bmBp)ME$K#HBU=Au^X(xG}=sl1}W{|sxc7NmXI)zc> z$JQ{xoNK;~$9m6Q>^sOpKHj(f=ifxAxqUm5{1s>EICEeN#jw{Sio$u z&FXvb5weNQBlF1)(s;Z~;RwkkKO`4P4!M;S5FJa%VoljERO5&w<)nxVCC`wNWHUKQ z8jtT#c$T!VhE>>;+)i58)yJ-FR#%?*c6!9X^&|80qWfp`8=R4u9m>oal9|1}IxqQu VEtx|GWYxWvcer_7&Di|({{V-6_JjZc diff --git a/po/nb.po b/po/nb.po index c397b4c..1fb39f3 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ 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 07:58+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: 2015-08-18 08:09+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/ru.gmo b/po/ru.gmo index 1f9dd1732743dda4cdea0a792a9620e7449ae858..09a13f3a412cdf4472403c922eb19ea4aadd36a1 100644 GIT binary patch delta 4662 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 delta 4628 zcmZYBdt8^*0mtzJ7?^?riXxz*38;y2RRoc%kkxdHj15w&F?&Od>5BU>6pvvyJd442$+i3NWf$sQQRnsN zLzl?F&N#|B6~m~{#h%7^jE6#R8n)O5a~So5FR>$j=e&x#pdWYXjv=Uy4M6%}Mj-!8 z5g&SxGSqddQ5~(t9=IK|@enTN{^llyZ8TJIHT^J(?iJ!NjKOMbhr4hfHef7%fja+Z zREHuNmOhw_YM+RGu^i)Yy=y=0+RtH6?r&~VP|qT{N+hPDeo&0MP$g=F>QEOvfI9yy z4#LaM=x|#fhx&aL#^ZL3#*^3||KW__BA#R#@+c(XBGePtqi%T8c?lz^2lL^Fw>$4} zCOd~ZGn`q@JZB;L^7}E!pqcRzjKAivj0Rchd>+-Y9oP@QKss%1pyo7;VbaLNpz68E z@-QW+wJ-}cGK(+~cj9n7jRn|+AM1fjqZofZ>2oy5J*W$PikHI}vez%brPODu&Z7F8hr$xZG?1&Y4oxj9D-d5rrqwi} z7Tw2qit~QNZ>b-rQM;k>cD5KEMeUXwsE)Mf@ik)M&P3;E)X>jFJ*cOWf}U(O&gTZl zFpzp`0#D0iDfr$O^np`+n47d@I$M9Bf4mb=M(w(G{S6w-B|P)?pTYi9D-` zWLVR+|Fb9zrlAU%Ub7o@!4L5+^iQ*MJqdNeM==lA;to1|8g;>{;VdZJin`ACsPo%r z+M$m_X3-R)zAy92{Cix(OQby$S?>1piJcO(> za}KozuHda0#p7$O#G=>F1XWu|AF(2^P;m|wq5lRsPhN8 z`e@X3r(on*BM==|}M&03Rqy~EjztZ(y;hk|Y#d8fTVCdN>ofD5q_|B4s!5}p}l z-(<%}8*`Al{}{VVj$%9N!DHDW7={drS%KO33F^fZG|oQAP)wlinNNWoWM0N;c*fOJ z*h|^e=b=t~6XWp$s)Ir7%@Rz;bXD(@119zUpc?=%KU%p z8oqb_fWBPds`I+@rqfKc-}~Vsoac`k!N)Ng_hB5iqDJaEYKo(I8kvi{rA-+YaeuQ$ z1^g4v!lcP87~F_i*qw3G+)Z{?qb~dg>PDaA{rD3yduBSr$8s?Bn1EL>7UP%)IUaMd z0zJGX&ASvdS3hDRCNm!$eCP}=@;7F|bcX&GMvA+rBU2u*{|9^q_4`ejkEhW;fW^#w zRrCA43+#U1$uKSE`(_Nq>~j0ZZbCWpA40<%8b)Fz?!hBikMmf{x?%W2`$r@fSJ9D` zsG;mu#ZFHN(d8Fn_^mw5Kz?gQ?fm*z2_*eKQM|*j;jN2`3DrVf<2KKEUO; z7so8KLv#a|Q_p(VcHko%LOqzqRal6-@f7MhPp+`L<{i`&Uc&}DylACu@3+RDKMP~{ zzO$#+{!b?rQ)rm$+=@xmPoZw;zt+A`GEr+{2BzUQ9Es=L_tER@`T3Yc`xBUqZ#uum z{?xm@XxD-#i-LMS8<}eJ3NmtL7v^Att6xMO#9T(5_mk7Cw>JntJy8Z~QO>|YxB_*< z0~n4MP^ zVG!PQ^^Tj2VKaFD(A|MLc!`>3vW)wiBSc46q6;h~j}aaF$$jJ#794oIMUr>ozKpOTrb{)AH$kRAW6GyYnoC8UM09K;yS*j*G1`^q zVJaCzcsZI^$ghbGw!CQ~YdI@JdIJt1Z+4U^3b6>h<^}*+S-% z1!N~_JN8oe4ap)K$tg07+(HV8j%u=4L-vVk934nG8A~$AizJ7\n" "Language-Team: Russian \n" diff --git a/po/trader.pot b/po/trader.pot index ee92f92..cc3f99f 100644 --- a/po/trader.pot +++ b/po/trader.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: trader 7.6\n" +"Project-Id-Version: trader 7.7\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-08-13 12:13+1000\n" +"POT-Creation-Date: 2015-08-18 09:44+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -278,7 +278,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "" -#: 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 ^{^} to cancel: " msgstr "" @@ -351,7 +351,7 @@ msgstr "" #. 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" @@ -497,32 +497,34 @@ msgstr "" #. (for <1> and <2>) or 38 characters wide (for <3> and #. ). 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 "" -#: src/move.c:245 +#: src/move.c:248 #, c-format msgid "^{<2>^} Declare bankruptcy" msgstr "" -#: src/move.c:247 +#: src/move.c:250 #, c-format msgid "^{<3>^} Save and end the game" msgstr "" -#: src/move.c:249 +#: src/move.c:252 #, c-format msgid "^{^} Quit the game" msgstr "" -#. 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^}/^{^}]: " msgstr "" @@ -534,73 +536,73 @@ msgstr "" #. 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 "" -#: src/move.c:316 +#: src/move.c:330 #, c-format msgid "^{<2>^} (Declare bankruptcy)" msgstr "" -#: src/move.c:325 +#: src/move.c:339 #, c-format msgid "^{<3>^} (Save and end the game)" msgstr "" -#: src/move.c:346 +#: src/move.c:360 #, c-format msgid "^{^} (Quit the game)" msgstr "" -#: src/move.c:361 +#: src/move.c:375 #, c-format msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "" -#: src/move.c:378 src/move.c:456 +#: src/move.c:392 src/move.c:470 #, c-format msgid "Saving game %d... " msgstr "" -#: 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 "" #. 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 "" #. TRANSLATORS: %ls is the player's name. -#: src/move.c:696 +#: src/move.c:710 #, c-format msgid "%ls has declared bankruptcy." msgstr "" -#: src/move.c:764 +#: src/move.c:778 #, c-format msgid " New Company " msgstr "" -#: src/move.c:765 +#: src/move.c:779 #, c-format msgid "" "A new company has been formed!\n" "Its name is ^{%ls^}." msgstr "" -#: src/move.c:824 +#: src/move.c:838 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" msgstr "" -#: src/move.c:830 +#: src/move.c:844 #, c-format msgid " Company Merger " msgstr "" @@ -612,7 +614,7 @@ msgstr "" #. 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: " @@ -620,7 +622,7 @@ msgstr "" #. 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: " @@ -631,7 +633,7 @@ msgstr "" #. 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)" @@ -640,7 +642,7 @@ msgstr "" #. 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" @@ -650,7 +652,7 @@ msgstr "" #. 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" @@ -659,14 +661,14 @@ 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:893 +#: src/move.c:907 #, c-format msgctxt "subtitle" msgid "Old" msgstr "" #. 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" @@ -675,7 +677,7 @@ msgid "" msgstr "" #. 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" @@ -691,7 +693,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: " @@ -701,25 +703,25 @@ msgstr "" #. 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 "" -#: 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 "" -#: src/move.c:1199 +#: src/move.c:1213 #, c-format msgid "" "You were forced to borrow %N\n" "to cover losses from company shares." msgstr "" -#: src/move.c:1234 +#: src/move.c:1248 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1376,13 +1378,14 @@ msgstr "" msgid "[ Press to continue ] " msgstr "" -#. TRANSLATORS: The specific use of and -#. is not essential: you can use , -#. , , or instead of -#. , and almost any other key instead of -#. (other than , , , , -#. or <\>). -#: src/help.c:494 +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , , , +#. or instead of , and almost +#. any other key instead of (other than , +#. , , , or <\>). +#. Note that the maximum label length is 76 characters, +#. including the trailing space. +#: src/help.c:495 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "" @@ -1488,57 +1491,62 @@ msgstr "" msgid "xwcrtomb: `%lc'" msgstr "" -#: 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 "" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" From 4a164f4aa994908f270766717e073f30a9336ad6 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 18 Aug 2015 10:19:28 +1000 Subject: [PATCH 25/25] Update build-aux files --- build-aux/compile | 232 ++++++++++++++++++++++++-- build-aux/config.guess | 192 +++------------------- build-aux/config.sub | 30 ++-- build-aux/depcomp | 2 +- build-aux/install-sh | 361 +++++++++++++++++++---------------------- build-aux/missing | 2 +- 6 files changed, 437 insertions(+), 382 deletions(-) diff --git a/build-aux/compile b/build-aux/compile index c0096a7..a85b723 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ scriptversion=2009-10-06.20; # UTC # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +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/,$2, in + *,$file_conv,*) + ;; + 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_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ EOF echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff --git a/build-aux/config.guess b/build-aux/config.guess index b79252d..1f5c50c 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-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 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." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - 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) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; 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) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 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." @@ -265,6 +265,7 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -324,7 +327,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +384,7 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +404,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +419,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -822,6 +829,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1367,14 +1378,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1603,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index 4ebd5b3..fc98710 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 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/build-aux/install-sh b/build-aux/install-sh index 377bb86..59990a1 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -207,6 +203,15 @@ if test $# -eq 0; then exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/build-aux/missing b/build-aux/missing index db98974..f62bbae 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify